diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:15:42 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2015-12-17 09:44:51 +0100 |
| commit | a1789ddde42033f1b05cc4929491214ee6e79383 (patch) | |
| tree | 63615735c4ddffaaabf2428946bb26f90899f7bf /includes/media/JpegMetadataExtractor.php | |
| parent | 9e06a62f265e3a2aaabecc598d4bc617e06fa32d (diff) | |
Update to MediaWiki 1.26.0
Diffstat (limited to 'includes/media/JpegMetadataExtractor.php')
| -rw-r--r-- | includes/media/JpegMetadataExtractor.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php index ae4af8d1..5069f180 100644 --- a/includes/media/JpegMetadataExtractor.php +++ b/includes/media/JpegMetadataExtractor.php @@ -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. |