diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:30:02 -0400 |
| commit | 1de335ad3f395ca6861085393ba366a9e3fb4a0d (patch) | |
| tree | f1fdd326034e05177596851be6a7127615d81498 /includes/Collation.php | |
| parent | 9c75fa8ff6d4d38ef552c00fef5969fb154765e8 (diff) | |
| parent | f6d65e533c62f6deb21342d4901ece24497b433e (diff) | |
Merge commit 'f6d65'
# Conflicts:
# skins/ArchLinux/ArchLinux.php
Diffstat (limited to 'includes/Collation.php')
| -rw-r--r-- | includes/Collation.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/Collation.php b/includes/Collation.php index 1c2c2db3..481d8e70 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; @@ -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; } |