summaryrefslogtreecommitdiff
path: root/includes/media/Exif.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/media/Exif.php')
-rw-r--r--includes/media/Exif.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/includes/media/Exif.php b/includes/media/Exif.php
index 33868689..b4cc43e5 100644
--- a/includes/media/Exif.php
+++ b/includes/media/Exif.php
@@ -294,9 +294,9 @@ class Exif {
$this->debugFile( $this->basename, __FUNCTION__, true );
if ( function_exists( 'exif_read_data' ) ) {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$data = exif_read_data( $this->file, 0, true );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
} else {
throw new MWException( "Internal error: exif_read_data not present. " .
"\$wgShowEXIF may be incorrectly set or not checked by an extension." );
@@ -471,17 +471,17 @@ class Exif {
break;
}
if ( $charset ) {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$val = iconv( $charset, 'UTF-8//IGNORE', $val );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
} else {
// if valid utf-8, assume that, otherwise assume windows-1252
$valCopy = $val;
UtfNormal\Validator::quickIsNFCVerify( $valCopy ); //validates $valCopy.
if ( $valCopy !== $val ) {
- wfSuppressWarnings();
+ MediaWiki\suppressWarnings();
$val = iconv( 'Windows-1252', 'UTF-8//IGNORE', $val );
- wfRestoreWarnings();
+ MediaWiki\restoreWarnings();
}
}