From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Thu, 4 Jun 2015 07:31:04 +0200 Subject: Update to MediaWiki 1.25.1 --- includes/media/JpegMetadataExtractor.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'includes/media/JpegMetadataExtractor.php') 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 { -- cgit v1.2.3-54-g00ecf