Merge "upload: Suppress warnings from iconv()" into REL1_43
This commit is contained in:
commit
f0a5bd0c72
1 changed files with 2 additions and 0 deletions
|
|
@ -1393,7 +1393,9 @@ abstract class UploadBase {
|
|||
}
|
||||
|
||||
if ( $enc !== null ) {
|
||||
AtEase::suppressWarnings();
|
||||
$chunk = iconv( $enc, "ASCII//IGNORE", $chunk );
|
||||
AtEase::restoreWarnings();
|
||||
}
|
||||
|
||||
$chunk = trim( $chunk );
|
||||
|
|
|
|||
Loading…
Reference in a new issue