Merge "Remove unused private field in MagicWordArray"

[lhc/web/wiklou.git] / includes / Collation.php

diff --git a/includes/Collation.php b/includes/Collation.php
index dac3e93..c1f0b38 100644 (file)
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -320,16 +320,16 @@ class IcuCollation extends Collation {
                // intl extension produces non null-terminated
                // strings. Appending '' fixes it so that it doesn't generate
                // a warning on each access in debug php.
-               wfSuppressWarnings();
+               MediaWiki\suppressWarnings();
                $key = $this->mainCollator->getSortKey( $string ) . '';
-               wfRestoreWarnings();
+               MediaWiki\restoreWarnings();
                return $key;
        }
 
        function getPrimarySortKey( $string ) {
-               wfSuppressWarnings();
+               MediaWiki\suppressWarnings();
                $key = $this->primaryCollator->getSortKey( $string ) . '';
-               wfRestoreWarnings();
+               MediaWiki\restoreWarnings();
                return $key;
        }
 
@@ -341,7 +341,7 @@ class IcuCollation extends Collation {
 
                // Check for CJK
                $firstChar = mb_substr( $string, 0, 1, 'UTF-8' );
-               if ( ord( $firstChar ) > 0x7f && self::isCjk( utf8ToCodepoint( $firstChar ) ) ) {
+               if ( ord( $firstChar ) > 0x7f && self::isCjk( UtfNormal\Utils::utf8ToCodepoint( $firstChar ) ) ) {
                        return $firstChar;
                }