X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCollation.php;h=c1f0b3881a13ef328239189512bca2542726180d;hb=9548b4be26eebba352eae238cbdc0c6395f50a08;hp=1c2c2db36ca017cb3827508da5f873d3b5be0686;hpb=0525f22b8825c617fffa98f191ab07e8113da085;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Collation.php b/includes/Collation.php
index 1c2c2db36c..c1f0b3881a 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -59,7 +59,7 @@ abstract class Collation {
 
 				# Provide a mechanism for extensions to hook in.
 				$collationObject = null;
-				wfRunHooks( 'Collation::factory', array( $collationName, &$collationObject ) );
+				Hooks::run( 'Collation::factory', array( $collationName, &$collationObject ) );
 
 				if ( $collationObject instanceof Collation ) {
 					return $collationObject;
@@ -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;
 		}