X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fmedia%2FExif.php;h=e4de0a1b5fcc7880823003a4a613fd2616ff4f96;hb=89b21847e151be15c41e667fa2a910ffbb72cf7d;hp=cd457f0beca125f17a0c689e8283983150197e84;hpb=50075483570e5106b3e8a2b3f469c8fe5254a1cf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index cd457f0bec..e4de0a1b5f 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -20,7 +20,7 @@
  * @ingroup Media
  * @author Ævar Arnfjörð Bjarmason <avarab@gmail.com>
  * @copyright Copyright © 2005, Ævar Arnfjörð Bjarmason, 2009 Brent Garber
- * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License
+ * @license GPL-2.0-or-later
  * @see http://exif.org/Exif2-2.PDF The Exif 2.2 specification
  * @file
  */
@@ -292,9 +292,9 @@ class Exif {
 
 		$this->debugFile( $this->basename, __FUNCTION__, true );
 		if ( function_exists( 'exif_read_data' ) ) {
-			MediaWiki\suppressWarnings();
+			Wikimedia\suppressWarnings();
 			$data = exif_read_data( $this->file, 0, true );
-			MediaWiki\restoreWarnings();
+			Wikimedia\restoreWarnings();
 		} else {
 			throw new MWException( "Internal error: exif_read_data not present. " .
 				"\$wgShowEXIF may be incorrectly set or not checked by an extension." );
@@ -467,17 +467,17 @@ class Exif {
 					break;
 			}
 			if ( $charset ) {
-				MediaWiki\suppressWarnings();
+				Wikimedia\suppressWarnings();
 				$val = iconv( $charset, 'UTF-8//IGNORE', $val );
-				MediaWiki\restoreWarnings();
+				Wikimedia\restoreWarnings();
 			} else {
 				// if valid utf-8, assume that, otherwise assume windows-1252
 				$valCopy = $val;
 				UtfNormal\Validator::quickIsNFCVerify( $valCopy ); // validates $valCopy.
 				if ( $valCopy !== $val ) {
-					MediaWiki\suppressWarnings();
+					Wikimedia\suppressWarnings();
 					$val = iconv( 'Windows-1252', 'UTF-8//IGNORE', $val );
-					MediaWiki\restoreWarnings();
+					Wikimedia\restoreWarnings();
 				}
 			}