X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fmedia%2FJpegMetadataExtractor.php;h=81722c6d620e0278aa17be77c47bcf87c3025cbb;hb=58cb1f824ac75c3b58ba19d1e88c1b38f9dc1fab;hp=ae4af8d1173d2a63de691882b34ebc2e1250e3b6;hpb=26a052181ccc8d00fb4a921c3502d5d3de3bea84;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index ae4af8d117..81722c6d62 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -52,11 +52,11 @@ class JpegMetadataExtractor {
 
 		$segmentCount = 0;
 
-		$segments = array(
-			'XMP_ext' => array(),
-			'COM' => array(),
-			'PSIR' => array(),
-		);
+		$segments = [
+			'XMP_ext' => [],
+			'COM' => [],
+			'PSIR' => [],
+		];
 
 		if ( !$filename ) {
 			throw new MWException( "No filename specified for " . __METHOD__ );
@@ -102,9 +102,9 @@ class JpegMetadataExtractor {
 				// turns $com to valid utf-8.
 				// thus if no change, its utf-8, otherwise its something else.
 				if ( $com !== $oldCom ) {
-					wfSuppressWarnings();
+					MediaWiki\suppressWarnings();
 					$com = $oldCom = iconv( 'windows-1252', 'UTF-8//IGNORE', $oldCom );
-					wfRestoreWarnings();
+					MediaWiki\restoreWarnings();
 				}
 				// Try it again, if its still not a valid string, then probably
 				// binary junk or some really weird encoding, so don't extract.