dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "ResourceLoaderImage: Throw exception if files don't exist"
[lhc/web/wiklou.git]
/
includes
/
Collation.php
diff --git
a/includes/Collation.php
b/includes/Collation.php
index
1c2c2db
..
481d8e7
100644
(file)
--- 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;
# 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;
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' );
// 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;
}
return $firstChar;
}