X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Flibs%2Fmime%2FMimeAnalyzer.php;h=d6c87b6e2a3abf2d51be4eb613cf56cd031cda99;hb=5bbace1a3667997a6ecc94c2d7259615bdc4176c;hp=4d860bb593b89dafa2f1ed96992553572f87bc89;hpb=2480aae0c97d822e10b50619e7b48b25c45af073;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/libs/mime/MimeAnalyzer.php b/includes/libs/mime/MimeAnalyzer.php index 4d860bb593..d6c87b6e2a 100644 --- a/includes/libs/mime/MimeAnalyzer.php +++ b/includes/libs/mime/MimeAnalyzer.php @@ -643,9 +643,9 @@ EOT; */ private function doGuessMimeType( $file, $ext ) { // Read a chunk of the file - MediaWiki\suppressWarnings(); + Wikimedia\suppressWarnings(); $f = fopen( $file, 'rb' ); - MediaWiki\restoreWarnings(); + Wikimedia\restoreWarnings(); if ( !$f ) { return 'unknown/unknown'; @@ -760,7 +760,9 @@ EOT; /** * look for XML formats (XHTML and SVG) */ + Wikimedia\suppressWarnings(); $xml = new XmlTypeCheck( $file ); + Wikimedia\restoreWarnings(); if ( $xml->wellFormed ) { $xmlTypes = $this->xmlTypes; if ( isset( $xmlTypes[$xml->getRootElement()] ) ) { @@ -833,9 +835,9 @@ EOT; } } - MediaWiki\suppressWarnings(); + Wikimedia\suppressWarnings(); $gis = getimagesize( $file ); - MediaWiki\restoreWarnings(); + Wikimedia\restoreWarnings(); if ( $gis && isset( $gis['mime'] ) ) { $mime = $gis['mime'];