X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCollation.php;h=c1f0b3881a13ef328239189512bca2542726180d;hb=6cf823b5cd9adfb078df7f62497be574c0e9490e;hp=dac3e938a8c11ef7c12c3b34ed4488b0ddd741d2;hpb=68644e2d340fc8ed1b43f47a0c4fd65cc62e6c7e;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Collation.php b/includes/Collation.php
index dac3e938a8..c1f0b3881a 100644
--- 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;
 		}