* Introduced a non-dummy collation for $wgCategoryCollation, namely UCA with default...

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

diff --git a/includes/Title.php b/includes/Title.php
index eeaf200..fd62d4d 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3088,8 +3088,6 @@ class Title {
         * @return Mixed true on success, getUserPermissionsErrors()-like array on failure
         */
        public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) {
-               global $wgContLang;
-
                $err = $this->isValidMoveOperation( $nt, $auth, $reason );
                if ( is_array( $err ) ) {
                        return $err;
@@ -3129,7 +3127,8 @@ class Title {
                );
                $dbw->update( 'categorylinks',
                        array(
-                               'cl_sortkey' => $wgContLang->convertToSortkey( $nt->getCategorySortkey( $prefix ) ),
+                               'cl_sortkey' => Collation::singleton()->getSortKey( 
+                                       $nt->getCategorySortkey( $prefix ) ),
                                'cl_timestamp=cl_timestamp' ),
                        array( 'cl_from' => $pageid ),
                        __METHOD__ );
@@ -4139,7 +4138,7 @@ class Title {
 
        /**
         * Returns the raw sort key to be used for categories, with the specified
-        * prefix.  This will be fed to Language::convertToSortkey() to get a
+        * prefix.  This will be fed to Collation::getSortKey() to get a
         * binary sortkey that can be used for actual sorting.
         *
         * @param $prefix string The prefix to be used, specified using
@@ -4153,7 +4152,7 @@ class Title {
                        # Separate with a null byte, so the unprefixed part is only used as
                        # a tiebreaker when two pages have the exact same prefix -- null
                        # sorts before everything else (hopefully).
-                       return "$prefix\0$unprefixed";
+                       return "$prefix\n$unprefixed";
                }
                return $unprefixed;
        }