diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:31:04 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2015-06-04 07:58:39 +0200 |
commit | f6d65e533c62f6deb21342d4901ece24497b433e (patch) | |
tree | f28adf0362d14bcd448f7b65a7aaf38650f923aa /includes/media/JpegMetadataExtractor.php | |
parent | c27b2e832fe25651ef2410fae85b41072aae7519 (diff) |
Update to MediaWiki 1.25.1
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 aaa9930a..ae4af8d1 100644 --- a/includes/media/JpegMetadataExtractor.php +++ b/includes/media/JpegMetadataExtractor.php @@ -98,7 +98,7 @@ class JpegMetadataExtractor { // First see if valid utf-8, // if not try to convert it to windows-1252. $com = $oldCom = trim( self::jpegExtractMarker( $fh ) ); - UtfNormal::quickIsNFCVerify( $com ); + UtfNormal\Validator::quickIsNFCVerify( $com ); // turns $com to valid utf-8. // thus if no change, its utf-8, otherwise its something else. if ( $com !== $oldCom ) { @@ -108,7 +108,7 @@ class JpegMetadataExtractor { } // Try it again, if its still not a valid string, then probably // binary junk or some really weird encoding, so don't extract. - UtfNormal::quickIsNFCVerify( $com ); + UtfNormal\Validator::quickIsNFCVerify( $com ); if ( $com === $oldCom ) { $segments["COM"][] = $oldCom; } else { |