Merge "Add language Doteli (dty)"

[lhc/web/wiklou.git] / includes / media / IPTC.php

diff --git a/includes/media/IPTC.php b/includes/media/IPTC.php
index 478249f..c3d58b8 100644 (file)
--- a/includes/media/IPTC.php
+++ b/includes/media/IPTC.php
@@ -445,9 +445,9 @@ class IPTC {
         */
        private static function convIPTCHelper( $data, $charset ) {
                if ( $charset ) {
-                       wfSuppressWarnings();
+                       MediaWiki\suppressWarnings();
                        $data = iconv( $charset, "UTF-8//IGNORE", $data );
-                       wfRestoreWarnings();
+                       MediaWiki\restoreWarnings();
                        if ( $data === false ) {
                                $data = "";
                                wfDebugLog( 'iptc', __METHOD__ . " Error converting iptc data charset $charset to utf-8" );
@@ -456,7 +456,7 @@ class IPTC {
                        //treat as utf-8 if is valid utf-8. otherwise pretend its windows-1252
                        // most of the time if there is no 1:90 tag, it is either ascii, latin1, or utf-8
                        $oldData = $data;
-                       UtfNormal::quickIsNFCVerify( $data ); //make $data valid utf-8
+                       UtfNormal\Validator::quickIsNFCVerify( $data ); //make $data valid utf-8
                        if ( $data === $oldData ) {
                                return $data; //if validation didn't change $data
                        } else {