Reconcept cl_raw_sortkey as cl_sortkey_prefix
[lhc/web/wiklou.git] / includes / Title.php
index 62a083a..aa0ec5f 100644 (file)
@@ -27,7 +27,6 @@ class Title {
        /** @name Static cache variables */
        // @{
        static private $titleCache = array();
-       static private $interwikiCache = array();
        // @}
 
        /**
@@ -93,10 +92,11 @@ class Title {
        public static function newFromDBkey( $key ) {
                $t = new Title();
                $t->mDbkeyform = $key;
-               if ( $t->secureAndSplit() )
+               if ( $t->secureAndSplit() ) {
                        return $t;
-               else
+               } else {
                        return null;
+               }
        }
 
        /**
@@ -218,12 +218,20 @@ class Title {
                        return array();
                }
                $dbr = wfGetDB( DB_SLAVE );
-               $res = $dbr->select( 'page', array( 'page_namespace', 'page_title' ),
-                       'page_id IN (' . $dbr->makeList( $ids ) . ')', __METHOD__ );
+               
+               $res = $dbr->select(
+                       'page',
+                       array(
+                               'page_namespace', 'page_title', 'page_id',
+                               'page_len', 'page_is_redirect', 'page_latest',
+                       ),
+                       array( 'page_id' => $ids ),
+                       __METHOD__
+               );
 
                $titles = array();
                foreach ( $res as $row ) {
-                       $titles[] = Title::makeTitle( $row->page_namespace, $row->page_title );
+                       $titles[] = Title::newFromRow( $row );
                }
                return $titles;
        }
@@ -240,7 +248,7 @@ class Title {
                $t->mArticleID = isset( $row->page_id ) ? intval( $row->page_id ) : -1;
                $t->mLength = isset( $row->page_len ) ? intval( $row->page_len ) : -1;
                $t->mRedirect = isset( $row->page_is_redirect ) ? (bool)$row->page_is_redirect : null;
-               $t->mLatestID = isset( $row->page_latest ) ? $row->page_latest : false;
+               $t->mLatestID = isset( $row->page_latest ) ? intval( $row->page_latest ) : false;
 
                return $t;
        }
@@ -255,11 +263,12 @@ class Title {
         * @param $ns \type{\int} the namespace of the article
         * @param $title \type{\string} the unprefixed database key form
         * @param $fragment \type{\string} The link fragment (after the "#")
+        * @param $interwiki \type{\string} The interwiki prefix
         * @return \type{Title} the new object
         */
-       public static function &makeTitle( $ns, $title, $fragment = '' ) {
+       public static function &makeTitle( $ns, $title, $fragment = '', $interwiki = '' ) {
                $t = new Title();
-               $t->mInterwiki = '';
+               $t->mInterwiki = $interwiki;
                $t->mFragment = $fragment;
                $t->mNamespace = $ns = intval( $ns );
                $t->mDbkeyform = str_replace( ' ', '_', $title );
@@ -277,11 +286,12 @@ class Title {
         * @param $ns \type{\int} the namespace of the article
         * @param $title \type{\string} the database key form
         * @param $fragment \type{\string} The link fragment (after the "#")
+        * @param $interwiki \type{\string} The interwiki prefix
         * @return \type{Title} the new object, or NULL on an error
         */
-       public static function makeTitleSafe( $ns, $title, $fragment = '' ) {
+       public static function makeTitleSafe( $ns, $title, $fragment = '', $interwiki = '' ) {
                $t = new Title();
-               $t->mDbkeyform = Title::makeName( $ns, $title, $fragment );
+               $t->mDbkeyform = Title::makeName( $ns, $title, $fragment, $interwiki );
                if ( $t->secureAndSplit() ) {
                        return $t;
                } else {
@@ -342,11 +352,13 @@ class Title {
        public static function newFromRedirectArray( $text ) {
                global $wgMaxRedirects;
                // are redirects disabled?
-               if ( $wgMaxRedirects < 1 )
+               if ( $wgMaxRedirects < 1 ) {
                        return null;
+               }
                $title = self::newFromRedirectInternal( $text );
-               if ( is_null( $title ) )
+               if ( is_null( $title ) ) {
                        return null;
+               }
                // recursive check to follow double redirects
                $recurse = $wgMaxRedirects;
                $titles = array( $title );
@@ -418,11 +430,15 @@ class Title {
        public static function nameOf( $id ) {
                $dbr = wfGetDB( DB_SLAVE );
 
-               $s = $dbr->selectRow( 'page',
+               $s = $dbr->selectRow(
+                       'page',
                        array( 'page_namespace', 'page_title' ),
                        array( 'page_id' => $id ),
-                       __METHOD__ );
-               if ( $s === false ) { return null; }
+                       __METHOD__
+               );
+               if ( $s === false ) {
+                       return null;
+               }
 
                $n = self::makeName( $s->page_namespace, $s->page_title );
                return $n;
@@ -473,13 +489,17 @@ class Title {
         * @param $ns \type{\int} numerical representation of the namespace
         * @param $title \type{\string} the DB key form the title
         * @param $fragment \type{\string} The link fragment (after the "#")
+        * @param $interwiki \type{\string} The interwiki prefix
         * @return \type{\string} the prefixed form of the title
         */
-       public static function makeName( $ns, $title, $fragment = '' ) {
+       public static function makeName( $ns, $title, $fragment = '', $interwiki = '' ) {
                global $wgContLang;
 
                $namespace = $wgContLang->getNsText( $ns );
                $name = $namespace == '' ? $title : "$namespace:$title";
+               if ( strval( $interwiki ) != '' ) {
+                       $name = "$interwiki:$name";
+               }
                if ( strval( $fragment ) != '' ) {
                        $name .= '#' . $fragment;
                }
@@ -508,12 +528,27 @@ class Title {
         * @return \type{\bool} TRUE if this is transcludable
         */
        public function isTrans() {
-               if ( $this->mInterwiki == '' )
+               if ( $this->mInterwiki == '' ) {
                        return false;
+               }
 
                return Interwiki::fetch( $this->mInterwiki )->isTranscludable();
        }
 
+       /**
+        * Returns the DB name of the distant wiki 
+        * which owns the object.
+        *
+        * @return \type{\string} the DB name
+        */
+       public function getTransWikiID() {
+               if ( $this->mInterwiki == '' ) {
+                       return false;
+               }
+
+               return Interwiki::fetch( $this->mInterwiki )->getWikiID();
+       }
+
        /**
         * Escape a text fragment, say from a link, for a URL
         *
@@ -718,8 +753,9 @@ class Title {
 
                $parts = explode( '/', $this->getText() );
                # Don't discard the real title if there's no subpage involved
-               if ( count( $parts ) > 1 )
-                       unset( $parts[ count( $parts ) - 1 ] );
+               if ( count( $parts ) > 1 ) {
+                       unset( $parts[count( $parts ) - 1] );
+               }
                return implode( '/', $parts );
        }
 
@@ -733,7 +769,7 @@ class Title {
                        return( $this->mTextform );
                }
                $parts = explode( '/', $this->mTextform );
-               return( $parts[ count( $parts ) - 1 ] );
+               return( $parts[count( $parts ) - 1] );
        }
 
        /**
@@ -769,7 +805,7 @@ class Title {
         * @return \type{\string} the URL
         */
        public function getFullURL( $query = '', $variant = false ) {
-               global $wgContLang, $wgServer, $wgRequest;
+               global $wgServer, $wgRequest;
 
                if ( is_array( $query ) ) {
                        $query = wfArrayToCGI( $query );
@@ -785,7 +821,7 @@ class Title {
                                $url = $wgServer . $url;
                        }
                } else {
-                       $baseUrl = $interwiki->getURL( );
+                       $baseUrl = $interwiki->getURL();
 
                        $namespace = wfUrlencode( $this->getNsText() );
                        if ( $namespace != '' ) {
@@ -826,8 +862,9 @@ class Title {
                // internal links should point to same variant as current page (only anonymous users)
                if ( !$variant && $wgContLang->hasVariants() && !$wgUser->isLoggedIn() ) {
                        $pref = $wgContLang->getPreferredVariant( false );
-                       if ( $pref != $wgContLang->getCode() )
+                       if ( $pref != $wgContLang->getCode() ) {
                                $variant = $pref;
+                       }
                }
 
                if ( $this->isExternal() ) {
@@ -863,7 +900,9 @@ class Title {
                                        $action = urldecode( $matches[2] );
                                        if ( isset( $wgActionPaths[$action] ) ) {
                                                $query = $matches[1];
-                                               if ( isset( $matches[4] ) ) $query .= $matches[4];
+                                               if ( isset( $matches[4] ) ) {
+                                                       $query .= $matches[4];
+                                               }
                                                $url = str_replace( '$1', $dbkey, $wgActionPaths[$action] );
                                                if ( $query != '' ) {
                                                        $url = wfAppendQuery( $url, $query );
@@ -963,7 +1002,9 @@ class Title {
         *  interwiki link
         */
        public function getEditURL() {
-               if ( $this->mInterwiki != '' ) { return ''; }
+               if ( $this->mInterwiki != '' ) {
+                       return '';
+               }
                $s = $this->getLocalURL( 'action=edit' );
 
                return $s;
@@ -984,7 +1025,9 @@ class Title {
         *
         * @return \type{\bool}
         */
-       public function isExternal() { return ( $this->mInterwiki != '' ); }
+       public function isExternal() {
+               return ( $this->mInterwiki != '' );
+       }
 
        /**
         * Is this page "semi-protected" - the *only* protection is autoconfirm?
@@ -997,8 +1040,9 @@ class Title {
                        $restrictions = $this->getRestrictions( $action );
                        if ( count( $restrictions ) > 0 ) {
                                foreach ( $restrictions as $restriction ) {
-                                       if ( strtolower( $restriction ) != 'autoconfirmed' )
+                                       if ( strtolower( $restriction ) != 'autoconfirmed' ) {
                                                return false;
+                                       }
                                }
                        } else {
                                # Not protected
@@ -1024,8 +1068,9 @@ class Title {
                $restrictionTypes = $this->getRestrictionTypes();
 
                # Special pages have inherent protection
-               if( $this->getNamespace() == NS_SPECIAL )
+               if( $this->getNamespace() == NS_SPECIAL ) {
                        return true;
+               }
 
                # Check regular protection levels
                foreach ( $restrictionTypes as $type ) {
@@ -1048,8 +1093,11 @@ class Title {
         * @return \type{\bool}
         */
        public function isConversionTable() {
-               if($this->getNamespace() == NS_MEDIAWIKI
-                  && strpos( $this->getText(), 'Conversiontable' ) !== false ) {
+               if(
+                       $this->getNamespace() == NS_MEDIAWIKI &&
+                       strpos( $this->getText(), 'Conversiontable' ) !== false
+               )
+               {
                        return true;
                }
 
@@ -1099,10 +1147,11 @@ class Title {
         */
        public function isNamespaceProtected() {
                global $wgNamespaceProtection, $wgUser;
-               if ( isset( $wgNamespaceProtection[ $this->mNamespace ] ) ) {
-                       foreach ( (array)$wgNamespaceProtection[ $this->mNamespace ] as $right ) {
-                               if ( $right != '' && !$wgUser->isAllowed( $right ) )
+               if ( isset( $wgNamespaceProtection[$this->mNamespace] ) ) {
+                       foreach ( (array)$wgNamespaceProtection[$this->mNamespace] as $right ) {
+                               if ( $right != '' && !$wgUser->isAllowed( $right ) ) {
                                        return true;
+                               }
                        }
                }
                return false;
@@ -1169,7 +1218,7 @@ class Title {
                if ( $action == 'create' ) {
                        if ( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
                                 ( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) {
-                               $errors[] = $user->isAnon() ? array ( 'nocreatetext' ) : array ( 'nocreate-loggedin' );
+                               $errors[] = $user->isAnon() ? array( 'nocreatetext' ) : array( 'nocreate-loggedin' );
                        }
                } elseif ( $action == 'move' ) {
                        if ( !$user->isAllowed( 'move-rootuserpages' )
@@ -1196,15 +1245,15 @@ class Title {
                                }
                                if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) {
                                        // custom message if logged-in users without any special rights can move
-                                       $errors[] = array ( 'movenologintext' );
+                                       $errors[] = array( 'movenologintext' );
                                } else {
-                                       $errors[] = array ( 'movenotallowed' );
+                                       $errors[] = array( 'movenotallowed' );
                                }
                        }
                } elseif ( $action == 'move-target' ) {
                        if ( !$user->isAllowed( 'move' ) ) {
                                // User can't move anything
-                               $errors[] = array ( 'movenotallowed' );
+                               $errors[] = array( 'movenotallowed' );
                        } elseif ( !$user->isAllowed( 'move-rootuserpages' )
                                        && $this->mNamespace == NS_USER && !$this->isSubpage() ) {
                                // Show user page-specific message only if the user can move other pages
@@ -1228,7 +1277,7 @@ class Title {
                                        count( $groups )
                                );
                        } else {
-                               $return = array( "badaccess-group0" );
+                               $return = array( 'badaccess-group0' );
                        }
                        $errors[] = $return;
                }
@@ -1437,9 +1486,7 @@ class Title {
                        return $errors;
                }
 
-               global $wgContLang;
-               global $wgLang;
-               global $wgEmailConfirmToEdit;
+               global $wgContLang, $wgLang, $wgEmailConfirmToEdit;
 
                if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() && $action != 'createaccount' ) {
                        $errors[] = array( 'confirmedittext' );
@@ -1477,7 +1524,7 @@ class Title {
                                        if ( !strpos( $option, ':' ) )
                                                continue;
 
-                                       list ( $show, $value ) = explode( ":", $option );
+                                       list( $show, $value ) = explode( ':', $option );
 
                                        if ( $value == 'infinite' || $value == 'indefinite' ) {
                                                $blockExpiry = $show;
@@ -1512,14 +1559,16 @@ class Title {
                wfProfileIn( __METHOD__ );
 
                $errors = array();
-               $checks = array( 'checkQuickPermissions',
+               $checks = array(
+                       'checkQuickPermissions',
                        'checkPermissionHooks',
                        'checkSpecialsAndNSPermissions',
                        'checkCSSandJSPermissions',
                        'checkPageRestrictions',
                        'checkCascadingSourcesRestrictions',
                        'checkActionPermissions',
-                       'checkUserBlock' );
+                       'checkUserBlock'
+               );
 
                while( count( $checks ) > 0 &&
                           !( $short && count( $errors ) > 0 ) ) {
@@ -1587,8 +1636,7 @@ class Title {
                if ( $encodedExpiry != 'infinity' ) {
                        $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ),
                                $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ) . ')';
-               }
-               else {
+               } else {
                        $expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ) . ')';
                }
 
@@ -1630,9 +1678,11 @@ class Title {
        public function deleteTitleProtection() {
                $dbw = wfGetDB( DB_MASTER );
 
-               $dbw->delete( 'protected_titles',
+               $dbw->delete(
+                       'protected_titles',
                        array( 'pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey() ),
-                       __METHOD__ );
+                       __METHOD__
+               );
        }
 
        /**
@@ -1687,8 +1737,9 @@ class Title {
                }
 
                # Shortcut for public wikis, allows skipping quite a bit of code
-               if ( $useShortcut )
+               if ( $useShortcut ) {
                        return true;
+               }
 
                if ( $wgUser->isAllowed( 'read' ) ) {
                        return true;
@@ -1724,8 +1775,9 @@ class Title {
                         * a colon for main-namespace pages
                         */
                        if ( $this->getNamespace() == NS_MAIN ) {
-                               if ( in_array( ':' . $name, $wgWhitelistRead ) )
+                               if ( in_array( ':' . $name, $wgWhitelistRead ) ) {
                                        return true;
+                               }
                        }
 
                        /**
@@ -1741,8 +1793,9 @@ class Title {
                                }
 
                                $pure = SpecialPage::getTitleFor( $name )->getPrefixedText();
-                               if ( in_array( $pure, $wgWhitelistRead, true ) )
+                               if ( in_array( $pure, $wgWhitelistRead, true ) ) {
                                        return true;
+                               }
                        }
 
                }
@@ -1789,8 +1842,9 @@ class Title {
                }
 
                $subpages = $this->getSubpages( 1 );
-               if ( $subpages instanceof TitleArray )
+               if ( $subpages instanceof TitleArray ) {
                        return $this->mHasSubpages = (bool)$subpages->count();
+               }
                return $this->mHasSubpages = false;
        }
 
@@ -1802,15 +1856,17 @@ class Title {
         *  doesn't allow subpages
         */
        public function getSubpages( $limit = -1 ) {
-               if ( !MWNamespace::hasSubpages( $this->getNamespace() ) )
+               if ( !MWNamespace::hasSubpages( $this->getNamespace() ) ) {
                        return array();
+               }
 
                $dbr = wfGetDB( DB_SLAVE );
                $conds['page_namespace'] = $this->getNamespace();
                $conds[] = 'page_title ' . $dbr->buildLike( $this->getDBkey() . '/', $dbr->anyString() );
                $options = array();
-               if ( $limit > -1 )
+               if ( $limit > -1 ) {
                        $options['LIMIT'] = $limit;
+               }
                return $this->mSubpages = TitleArray::newFromResult(
                        $dbr->select( 'page',
                                array( 'page_id', 'page_namespace', 'page_title', 'page_is_redirect' ),
@@ -1849,7 +1905,9 @@ class Title {
        public function isValidCssJsSubpage() {
                if ( $this->isCssJsSubpage() ) {
                        $name = $this->getSkinFromCssJsSubpage();
-                       if ( $name == 'common' ) return true;
+                       if ( $name == 'common' ) {
+                               return true;
+                       }
                        $skinNames = Skin::getSkinNames();
                        return array_key_exists( $name, $skinNames );
                } else {
@@ -1898,6 +1956,7 @@ class Title {
                return ( ( $wgUser->isAllowed( 'editusercssjs' ) && $wgUser->isAllowed( 'editusercss' ) )
                        || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
        }
+
        /**
         * Protect js subpages of user pages: can $wgUser edit
         * this page?
@@ -1946,18 +2005,20 @@ class Title {
                $dbr = wfGetDB( DB_SLAVE );
 
                if ( $this->getNamespace() == NS_FILE ) {
-                       $tables = array ( 'imagelinks', 'page_restrictions' );
+                       $tables = array( 'imagelinks', 'page_restrictions' );
                        $where_clauses = array(
                                'il_to' => $this->getDBkey(),
                                'il_from=pr_page',
-                               'pr_cascade' => 1 );
+                               'pr_cascade' => 1
+                       );
                } else {
-                       $tables = array ( 'templatelinks', 'page_restrictions' );
+                       $tables = array( 'templatelinks', 'page_restrictions' );
                        $where_clauses = array(
                                'tl_namespace' => $this->getNamespace(),
                                'tl_title' => $this->getDBkey(),
                                'tl_from=pr_page',
-                               'pr_cascade' => 1 );
+                               'pr_cascade' => 1
+                       );
                }
 
                if ( $getPages ) {
@@ -2142,7 +2203,7 @@ class Title {
                                $dbr = wfGetDB( DB_SLAVE );
 
                                $res = $dbr->select( 'page_restrictions', '*',
-                                       array ( 'pr_page' => $this->getArticleId() ), __METHOD__ );
+                                       array( 'pr_page' => $this->getArticleId() ), __METHOD__ );
 
                                $this->loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions );
                        } else {
@@ -2172,13 +2233,17 @@ class Title {
         */
        static function purgeExpiredRestrictions() {
                $dbw = wfGetDB( DB_MASTER );
-               $dbw->delete( 'page_restrictions',
+               $dbw->delete(
+                       'page_restrictions',
                        array( 'pr_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ),
-                       __METHOD__ );
+                       __METHOD__
+               );
 
-               $dbw->delete( 'protected_titles',
+               $dbw->delete(
+                       'protected_titles',
                        array( 'pt_expiry < ' . $dbw->addQuotes( $dbw->timestamp() ) ),
-                       __METHOD__ );
+                       __METHOD__
+               );
        }
 
        /**
@@ -2290,8 +2355,9 @@ class Title {
         * @return \type{\bool}
         */
        public function isRedirect( $flags = 0 ) {
-               if ( !is_null( $this->mRedirect ) )
+               if ( !is_null( $this->mRedirect ) ) {
                        return $this->mRedirect;
+               }
                # Calling getArticleID() loads the field from cache as needed
                if ( !$this->getArticleID( $flags ) ) {
                        return $this->mRedirect = false;
@@ -2310,8 +2376,9 @@ class Title {
         * @return \type{\bool}
         */
        public function getLength( $flags = 0 ) {
-               if ( $this->mLength != -1 )
+               if ( $this->mLength != -1 ) {
                        return $this->mLength;
+               }
                # Calling getArticleID() loads the field from cache as needed
                if ( !$this->getArticleID( $flags ) ) {
                        return $this->mLength = 0;
@@ -2329,8 +2396,9 @@ class Title {
         * @return \type{\int} or 0 if the page doesn't exist
         */
        public function getLatestRevID( $flags = 0 ) {
-               if ( $this->mLatestID !== false )
-                       return $this->mLatestID;
+               if ( $this->mLatestID !== false ) {
+                       return intval( $this->mLatestID );
+               }
                # Calling getArticleID() loads the field from cache as needed
                if ( !$this->getArticleID( $flags ) ) {
                        return $this->mLatestID = 0;
@@ -2345,10 +2413,6 @@ class Title {
         * This clears some fields in this object, and clears any associated
         * keys in the "bad links" section of the link cache.
         *
-        * - This is called from Article::insertNewArticle() to allow
-        * loading of the new page_id. It's also called from
-        * Article::doDeleteArticle()
-        *
         * @param $newid \type{\int} the new Article ID
         */
        public function resetArticleID( $newid ) {
@@ -2377,7 +2441,8 @@ class Title {
                        return;
                }
                $dbw = wfGetDB( DB_MASTER );
-               $success = $dbw->update( 'page',
+               $success = $dbw->update(
+                       'page',
                        array( 'page_touched' => $dbw->timestamp() ),
                        $this->pageCond(),
                        __METHOD__
@@ -2442,10 +2507,11 @@ class Title {
        public static function capitalize( $text, $ns = NS_MAIN ) {
                global $wgContLang;
 
-               if ( MWNamespace::isCapitalized( $ns ) )
+               if ( MWNamespace::isCapitalized( $ns ) ) {
                        return $wgContLang->ucfirst( $text );
-               else
+               } else {
                        return $text;
+               }
        }
 
        /**
@@ -2515,10 +2581,11 @@ class Title {
                                        $this->mNamespace = $ns;
                                        # For Talk:X pages, check if X has a "namespace" prefix
                                        if ( $ns == NS_TALK && preg_match( $prefixRegexp, $dbkey, $x ) ) {
-                                               if ( $wgContLang->getNsIndex( $x[1] ) )
+                                               if ( $wgContLang->getNsIndex( $x[1] ) ) {
                                                        return false; # Disallow Talk:File:x type titles...
-                                               else if ( Interwiki::isValidInterwiki( $x[1] ) )
+                                               } else if ( Interwiki::isValidInterwiki( $x[1] ) ) {
                                                        return false; # Disallow Talk:Interwiki:x type titles...
+                                               }
                                        }
                                } elseif ( Interwiki::isValidInterwiki( $p ) ) {
                                        if ( !$firstPass ) {
@@ -2563,7 +2630,7 @@ class Title {
                }
                $fragment = strstr( $dbkey, '#' );
                if ( false !== $fragment ) {
-                       $this->setFragment( $fragment );
+                       $this->setFragment( preg_replace( '/^#_*/', '#', $fragment ) );
                        $dbkey = substr( $dbkey, 0, strlen( $dbkey ) - strlen( $fragment ) );
                        # remove whitespace again: prevents "Foo_bar_#"
                        # becoming "Foo_bar_"
@@ -2622,7 +2689,7 @@ class Title {
                 * site might be case-sensitive.
                 */
                $this->mUserCaseDBKey = $dbkey;
-               if (  $this->mInterwiki == '' ) {
+               if ( $this->mInterwiki == '' ) {
                        $dbkey = self::capitalize( $dbkey, $this->mNamespace );
                }
 
@@ -2717,14 +2784,16 @@ class Title {
                        $db = wfGetDB( DB_SLAVE );
                }
 
-               $res = $db->select( array( 'page', $table ),
+               $res = $db->select(
+                       array( 'page', $table ),
                        array( 'page_namespace', 'page_title', 'page_id', 'page_len', 'page_is_redirect', 'page_latest' ),
                        array(
                                "{$prefix}_from=page_id",
                                "{$prefix}_namespace" => $this->getNamespace(),
                                "{$prefix}_title"     => $this->getDBkey() ),
                        __METHOD__,
-                       $options );
+                       $options
+               );
 
                $retVal = array();
                if ( $db->numRows( $res ) ) {
@@ -2808,7 +2877,6 @@ class Title {
                if ( $wgContLang->hasVariants() ) {
                        $variants = $wgContLang->getVariants();
                        foreach ( $variants as $vCode ) {
-                               if ( $vCode == $wgContLang->getCode() ) continue; // we don't want default variant
                                $urls[] = $this->getInternalURL( '', $vCode );
                        }
                }
@@ -2884,11 +2952,11 @@ class Title {
 
                // Image-specific checks
                if ( $this->getNamespace() == NS_FILE ) {
+                       if ( $nt->getNamespace() != NS_FILE ) {
+                               $errors[] = array( 'imagenocrossnamespace' );
+                       }
                        $file = wfLocalFile( $this );
                        if ( $file->exists() ) {
-                               if ( $nt->getNamespace() != NS_FILE ) {
-                                       $errors[] = array( 'imagenocrossnamespace' );
-                               }
                                if ( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) {
                                        $errors[] = array( 'imageinvalidfilename' );
                                }
@@ -2900,7 +2968,10 @@ class Title {
                        if ( !$wgUser->isAllowed( 'reupload-shared' ) && !$destfile->exists() && wfFindFile( $nt ) ) {
                                $errors[] = array( 'file-exists-sharedrepo' );
                        }
+               }
 
+               if ( $nt->getNamespace() == NS_FILE && $this->getNamespace() != NS_FILE ) {
+                       $errors[] = array( 'nonfile-cannot-move-to-file' );
                }
 
                if ( $auth ) {
@@ -2927,7 +2998,7 @@ class Title {
                # (so we can undo bad moves right after they're done).
 
                if ( 0 != $newid ) { # Target exists; check for validity
-                       if ( ! $this->isValidMoveTarget( $nt ) ) {
+                       if ( !$this->isValidMoveTarget( $nt ) ) {
                                $errors[] = array( 'articleexists' );
                        }
                } else {
@@ -2937,8 +3008,9 @@ class Title {
                                $errors[] = array( 'cantmove-titleprotected' );
                        }
                }
-               if ( empty( $errors ) )
+               if ( empty( $errors ) ) {
                        return true;
+               }
                return $errors;
        }
 
@@ -3024,7 +3096,9 @@ class Title {
                        # Update the protection log
                        $log = new LogPage( 'protect' );
                        $comment = wfMsgForContent( 'prot_1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
-                       if ( $reason ) $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
+                       if ( $reason ) {
+                               $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
+                       }
                        $log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) ); // FIXME: $params?
                }
 
@@ -3060,8 +3134,9 @@ class Title {
                        # Nothing special
                        $u = false;
                }
-               if ( $u )
+               if ( $u ) {
                        $u->doUpdate();
+               }
                # Update message cache for interface messages
                if ( $nt->getNamespace() == NS_MEDIAWIKI ) {
                        global $wgMessageCache;
@@ -3124,8 +3199,9 @@ class Title {
                if ( !$dbw->cascadingDeletes() ) {
                        $dbw->delete( 'revision', array( 'rev_page' => $newid ), __METHOD__ );
                        global $wgUseTrackbacks;
-                       if ( $wgUseTrackbacks )
+                       if ( $wgUseTrackbacks ) {
                                $dbw->delete( 'trackbacks', array( 'tb_page' => $newid ), __METHOD__ );
+                       }
                        $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), __METHOD__ );
                        $dbw->delete( 'imagelinks', array( 'il_from' => $newid ), __METHOD__ );
                        $dbw->delete( 'categorylinks', array( 'cl_from' => $newid ), __METHOD__ );
@@ -3212,7 +3288,7 @@ class Title {
         *  Ignored if the user doesn't have the suppressredirect right
         */
        private function moveToNewTitle( &$nt, $reason = '', $createRedirect = true ) {
-               global $wgUseSquid, $wgUser, $wgContLang;
+               global $wgUser, $wgContLang;
 
                $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
                if ( $reason ) {
@@ -3291,7 +3367,6 @@ class Title {
                # Purge old title from squid
                # The new title, and links to the new title, are purged in Article::onArticleCreate()
                $this->purgeSquid();
-
        }
 
        /**
@@ -3308,15 +3383,18 @@ class Title {
        public function moveSubpages( $nt, $auth = true, $reason = '', $createRedirect = true ) {
                global $wgMaximumMovedPages;
                // Check permissions
-               if ( !$this->userCan( 'move-subpages' ) )
+               if ( !$this->userCan( 'move-subpages' ) ) {
                        return array( 'cant-move-subpages' );
+               }
                // Do the source and target namespaces support subpages?
-               if ( !MWNamespace::hasSubpages( $this->getNamespace() ) )
+               if ( !MWNamespace::hasSubpages( $this->getNamespace() ) ) {
                        return array( 'namespace-nosubpages',
                                MWNamespace::getCanonicalName( $this->getNamespace() ) );
-               if ( !MWNamespace::hasSubpages( $nt->getNamespace() ) )
+               }
+               if ( !MWNamespace::hasSubpages( $nt->getNamespace() ) ) {
                        return array( 'namespace-nosubpages',
                                MWNamespace::getCanonicalName( $nt->getNamespace() ) );
+               }
 
                $subpages = $this->getSubpages( $wgMaximumMovedPages + 1 );
                $retval = array();
@@ -3335,9 +3413,11 @@ class Title {
                        // $this and $nt
                        if ( $oldSubpage->getArticleId() == $this->getArticleId() ||
                                        $oldSubpage->getArticleID() == $nt->getArticleId() )
+                       {
                                // When moving a page to a subpage of itself,
                                // don't move it twice
                                continue;
+                       }
                        $newPageName = preg_replace(
                                        '#^' . preg_quote( $this->getDBkey(), '#' ) . '#',
                                        StringUtils::escapeRegexReplacement( $nt->getDBkey() ), # bug 21234
@@ -3406,8 +3486,7 @@ class Title {
         * @return \type{\bool} TRUE or FALSE
         */
        public function isValidMoveTarget( $nt ) {
-               $dbw = wfGetDB( DB_MASTER );
-               # Is it an existsing file?
+               # Is it an existing file?
                if ( $nt->getNamespace() == NS_FILE ) {
                        $file = wfLocalFile( $nt );
                        if ( $file->exists() ) {
@@ -3575,7 +3654,9 @@ class Title {
        public function getFirstRevision( $flags = 0 ) {
                $db = ( $flags & GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
                $pageId = $this->getArticleId( $flags );
-               if ( !$pageId ) return null;
+               if ( !$pageId ) {
+                       return null;
+               }
                $row = $db->selectRow( 'revision', '*',
                        array( 'rev_page' => $pageId ),
                        __METHOD__,
@@ -3738,8 +3819,9 @@ class Title {
         * @return Boolean
         */
        public function hasSourceText() {
-               if ( $this->exists() )
+               if ( $this->exists() ) {
                        return true;
+               }
 
                if ( $this->mNamespace == NS_MEDIAWIKI ) {
                        // If the page doesn't exist but is a known system message, default
@@ -3755,11 +3837,11 @@ class Title {
        }
 
        /**
-       * Is this in a namespace that allows actual pages?
-       *
-       * @return \type{\bool}
-       * @internal note -- uses hardcoded namespace index instead of constants
-       */
+        * Is this in a namespace that allows actual pages?
+        *
+        * @return \type{\bool}
+        * @internal note -- uses hardcoded namespace index instead of constants
+        */
        public function canExist() {
                return $this->mNamespace >= 0 && $this->mNamespace != NS_MEDIA;
        }
@@ -3800,7 +3882,9 @@ class Title {
        public function getNotificationTimestamp( $user = null ) {
                global $wgUser, $wgShowUpdatedMarker;
                // Assume current user if none given
-               if ( !$user ) $user = $wgUser;
+               if ( !$user ) {
+                       $user = $wgUser;
+               }
                // Check cache first
                $uid = $user->getId();
                if ( isset( $this->mNotificationTimestamp[$uid] ) ) {
@@ -3901,7 +3985,7 @@ class Title {
         *
         * @return boolean
         */
-       public function isSpecialPage( ) {
+       public function isSpecialPage() {
                return $this->getNamespace() == NS_SPECIAL;
        }
 
@@ -3967,7 +4051,9 @@ class Title {
                        'rd_title' => $this->getDBkey(),
                        'rd_from = page_id'
                );
-               if ( !is_null( $ns ) ) $where['page_namespace'] = $ns;
+               if ( !is_null( $ns ) ) {
+                       $where['page_namespace'] = $ns;
+               }
 
                $res = $dbr->select(
                        array( 'redirect', 'page' ),
@@ -4024,8 +4110,7 @@ class Title {
         * @return Boolean
         */
        public function canUseNoindex() {
-               global $wgArticleRobotPolicies, $wgContentNamespaces,
-                      $wgExemptFromUserRobotsControl;
+               global $wgContentNamespaces, $wgExemptFromUserRobotsControl;
 
                $bannedNamespaces = is_null( $wgExemptFromUserRobotsControl )
                        ? $wgContentNamespaces
@@ -4052,4 +4137,22 @@ class Title {
 
                return $types;
        }
+
+       /**
+        * Returns what the default sort key for categories would be, if
+        * {{defaultsort:}} isn't used.  This is the same as getText() for
+        * categories, and for everything if $wgCategoryPrefixedDefaultSortkey is
+        * false; otherwise it's the same as getPrefixedText().
+        *
+        * @return string
+        */
+       public function getCategorySortkey() {
+               global $wgCategoryPrefixedDefaultSortkey;
+               if ( $this->getNamespace() == NS_CATEGORY
+               || !$wgCategoryPrefixedDefaultSortkey ) {
+                       return $this->getText();
+               } else {
+                       return $this->getPrefixedText();
+               }
+       }
 }