follow-up r59522, r59523, r59527, r59529, r59530.
[lhc/web/wiklou.git] / includes / Title.php
index d7c65bb..939d92e 100644 (file)
@@ -546,7 +546,7 @@ class Title {
         * @return \type{\string} Namespace text
         */
        public function getNsText() {
-               global $wgContLang, $wgCanonicalNamespaceNames;
+               global $wgContLang;
 
                if ( '' != $this->mInterwiki ) {
                        // This probably shouldn't even happen. ohh man, oh yuck.
@@ -555,8 +555,8 @@ class Title {
                        //
                        // Use the canonical namespaces if possible to try to
                        // resolve a foreign namespace.
-                       if( isset( $wgCanonicalNamespaceNames[$this->mNamespace] ) ) {
-                               return $wgCanonicalNamespaceNames[$this->mNamespace];
+                       if( MWNamespace::exists( $this->mNamespace ) ) {
+                               return MWNamespace::getCanonicalName( $this->mNamespace );
                        }
                }
                return $wgContLang->getNsText( $this->mNamespace );
@@ -733,7 +733,7 @@ class Title {
 
                $interwiki = Interwiki::fetch( $this->mInterwiki );
                if ( !$interwiki ) {
-                       $url = $this->getLocalUrl( $query, $variant );
+                       $url = $this->getLocalURL( $query, $variant );
 
                        // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc)
                        // Correct fix would be to move the prepending elsewhere.
@@ -862,11 +862,6 @@ class Title {
         */
        public function getLinkUrl( $query = array(), $variant = false ) {
                wfProfileIn( __METHOD__ );
-               if( !is_array( $query ) ) {
-                       wfProfileOut( __METHOD__ );
-                       throw new MWException( 'Title::getLinkUrl passed a non-array for '.
-                       '$query' );
-               }
                if( $this->isExternal() ) {
                        $ret = $this->getFullURL( $query );
                } elseif( $this->getPrefixedText() === '' && $this->getFragment() !== '' ) {
@@ -970,18 +965,20 @@ class Title {
        /**
         * Does the title correspond to a protected article?
         * @param $what \type{\string} the action the page is protected from,
-        * by default checks move and edit
+        * by default checks all actions.
         * @return \type{\bool}
         */
        public function isProtected( $action = '' ) {
-               global $wgRestrictionLevels, $wgRestrictionTypes;
+               global $wgRestrictionLevels;
+               
+               $restrictionTypes = $this->getRestrictionTypes();
 
                # Special pages have inherent protection
                if( $this->getNamespace() == NS_SPECIAL )
                        return true;
 
                # Check regular protection levels
-               foreach( $wgRestrictionTypes as $type ){
+               foreach( $restrictionTypes as $type ){
                        if( $action == $type || $action == '' ) {
                                $r = $this->getRestrictions( $type );
                                foreach( $wgRestrictionLevels as $level ) {
@@ -1014,7 +1011,8 @@ class Title {
 
        /**
         * Can $wgUser perform $action on this page?
-        * This skips potentially expensive cascading permission checks.
+        * This skips potentially expensive cascading permission checks
+        * as well as avoids expensive error formatting
         *
         * Suitable for use for nonessential UI controls in common cases, but
         * _not_ for functional access control.
@@ -1180,8 +1178,15 @@ class Title {
                        if( !$user->isAllowed( 'move' ) ) {
                                // User can't move anything
                                global $wgGroupPermissions;
-                               if( $user->isAnon() && ( $wgGroupPermissions['user']['move']
-                               || $wgGroupPermissions['autoconfirmed']['move'] ) ) {
+                               $userCanMove = false;
+                               if ( isset( $wgGroupPermissions['user']['move'] ) ) {
+                                       $userCanMove = $wgGroupPermissions['user']['move'];
+                               }
+                               $autoconfirmedCanMove = false;
+                               if ( isset( $wgGroupPermissions['autoconfirmed']['move'] ) ) {
+                                       $autoconfirmedCanMove = $wgGroupPermissions['autoconfirmed']['move'];
+                               }
+                               if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) {
                                        // custom message if logged-in users without any special rights can move
                                        $errors[] = array ( 'movenologintext' );
                                } else {
@@ -1206,8 +1211,14 @@ class Title {
                        }
                } elseif( !$user->isAllowed( $action ) ) {
                        $return = null;
-                       $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
-                               User::getGroupsWithPermission( $action ) );
+                       
+                       // We avoid expensive display logic for quickUserCan's and such
+                       $groups = false; 
+                       if (!$short) {
+                               $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
+                                       User::getGroupsWithPermission( $action ) );
+                       } 
+                       
                        if( $groups ) {
                                $return = array( 'badaccess-groups',
                                        array( implode( ', ', $groups ), count( $groups ) ) );
@@ -1278,8 +1289,16 @@ class Title {
 
                # Protect css/js subpages of user pages
                # XXX: this might be better using restrictions
-               # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssJsSubpage() from working
-               if( $this->isCssJsSubpage() && !$user->isAllowed('editusercssjs')
+               # XXX: Find a way to work around the php bug that prevents using $this->userCanEditCssSubpage() 
+               #      and $this->userCanEditJsSubpage() from working
+               # XXX: right 'editusercssjs' is deprecated, for backward compatibility only
+               if( $this->isCssSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('editusercss') )
+                       && $action != 'patrol'
+                       && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
+               {
+                       $errors[] = array('customcssjsprotected');
+               } else if( $this->isJsSubpage() && !( $user->isAllowed('editusercssjs') || $user->isAllowed('edituserjs') )
+                       && $action != 'patrol'
                        && !preg_match('/^'.preg_quote($user->getName(), '/').'\//', $this->mTextform) )
                {
                        $errors[] = array('customcssjsprotected');
@@ -1388,6 +1407,11 @@ class Title {
                if ( $this->getNamespace() < 0 ) {
                        return false;
                }
+               
+               // Can't protect pages that exist.
+               if ($this->exists()) {
+                       return false;
+               }
 
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( 'protected_titles', '*',
@@ -1424,7 +1448,8 @@ class Title {
 
                $expiry_description = '';
                if ( $encodedExpiry != 'infinity' ) {
-                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring', $wgContLang->timeanddate( $expiry ) , $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
+                       $expiry_description = ' (' . wfMsgForContent( 'protect-expiring',$wgContLang->timeanddate( $expiry ),
+                               $wgContLang->date( $expiry ) , $wgContLang->time( $expiry ) ).')';
                }
                else {
                        $expiry_description .= ' (' . wfMsgForContent( 'protect-expiry-indefinite' ).')';
@@ -1433,23 +1458,30 @@ class Title {
                # Update protection table
                if ($create_perm != '' ) {
                        $dbw->replace( 'protected_titles', array(array('pt_namespace', 'pt_title')),
-                               array( 'pt_namespace' => $namespace, 'pt_title' => $title
-                                       , 'pt_create_perm' => $create_perm
-                                       , 'pt_timestamp' => Block::encodeExpiry(wfTimestampNow(), $dbw)
-                                       , 'pt_expiry' => $encodedExpiry
-                                       , 'pt_user' => $wgUser->getId(), 'pt_reason' => $reason ), __METHOD__  );
+                               array(
+                                       'pt_namespace' => $namespace,
+                                       'pt_title' => $title,
+                                       'pt_create_perm' => $create_perm,
+                                       'pt_timestamp' => Block::encodeExpiry(wfTimestampNow(), $dbw),
+                                       'pt_expiry' => $encodedExpiry,
+                                       'pt_user' => $wgUser->getId(),
+                                       'pt_reason' => $reason,
+                               ), __METHOD__
+                       );
                } else {
                        $dbw->delete( 'protected_titles', array( 'pt_namespace' => $namespace,
                                'pt_title' => $title ), __METHOD__ );
                }
                # Update the protection log
-               $log = new LogPage( 'protect' );
+               if( $dbw->affectedRows() ) {
+                       $log = new LogPage( 'protect' );
 
-               if( $create_perm ) {
-                       $params = array("[create=$create_perm] $expiry_description",'');
-                       $log->addEntry( ( isset( $this->mRestrictions['create'] ) && $this->mRestrictions['create'] ) ? 'modify' : 'protect', $this, trim( $reason ), $params );
-               } else {
-                       $log->addEntry( 'unprotect', $this, $reason );
+                       if( $create_perm ) {
+                               $params = array("[create=$create_perm] $expiry_description",'');
+                               $log->addEntry( ( isset( $this->mRestrictions['create'] ) && $this->mRestrictions['create'] ) ? 'modify' : 'protect', $this, trim( $reason ), $params );
+                       } else {
+                               $log->addEntry( 'unprotect', $this, $reason );
+                       }
                }
 
                return true;
@@ -1494,8 +1526,14 @@ class Title {
                                # Not a public wiki, so no shortcut
                                $useShortcut = false;
                        } elseif( !empty( $wgRevokePermissions ) ) {
-                               foreach( array_keys( $wgRevokePermissions ) as $group ) {
-                                       if( !empty( $wgRevokePermissions[$group]['read'] ) ) {
+                               /*
+                                * Iterate through each group with permissions being revoked (key not included since we don't care
+                                * what the group name is), then check if the read permission is being revoked. If it is, then
+                                * we don't use the shortcut below since the user might not be able to read, even though anon
+                                * reading is allowed.
+                                */
+                               foreach( $wgRevokePermissions as $perms ) {
+                                       if( !empty( $perms['read'] ) ) {
                                                # We might be removing the read right from the user, so no shortcut
                                                $useShortcut = false;
                                                break;
@@ -1627,8 +1665,7 @@ class Title {
 
                $dbr = wfGetDB( DB_SLAVE );
                $conds['page_namespace'] = $this->getNamespace();
-               $conds[] = 'page_title LIKE ' . $dbr->addQuotes(
-                               $dbr->escapeLike( $this->getDBkey() ) . '/%' );
+               $conds[] = 'page_title ' . $dbr->buildLike( $this->getDBkey() . '/', $dbr->anyString() );
                $options = array();
                if( $limit > -1 )
                        $options['LIMIT'] = $limit;
@@ -1696,15 +1733,28 @@ class Title {
                return ( NS_USER == $this->mNamespace && preg_match("/\\/.*\\.js$/", $this->mTextform ) );
        }
        /**
-        * Protect css/js subpages of user pages: can $wgUser edit
+        * Protect css subpages of user pages: can $wgUser edit
         * this page?
         *
         * @return \type{\bool} TRUE or FALSE
         * @todo XXX: this might be better using restrictions
         */
-       public function userCanEditCssJsSubpage() {
+       public function userCanEditCssSubpage() {
                global $wgUser;
-               return ( $wgUser->isAllowed('editusercssjs') || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+               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?
+        *
+        * @return \type{\bool} TRUE or FALSE
+        * @todo XXX: this might be better using restrictions
+        */
+       public function userCanEditJsSubpage() {
+               global $wgUser;
+               return ( ( $wgUser->isAllowed('editusercssjs') && $wgUser->isAllowed('edituserjs') )
+                       || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
        }
 
        /**
@@ -1726,12 +1776,7 @@ class Title {
         *         The restriction array is an array of each type, each of which contains an array of unique groups.
         */
        public function getCascadeProtectionSources( $get_pages = true ) {
-               global $wgRestrictionTypes;
-
-               # Define our dimension of restrictions types
                $pagerestrictions = array();
-               foreach( $wgRestrictionTypes as $action )
-                       $pagerestrictions[$action] = array();
 
                if ( isset( $this->mCascadeSources ) && $get_pages ) {
                        return array( $this->mCascadeSources, $this->mCascadingRestrictions );
@@ -1782,7 +1827,13 @@ class Title {
                                        $sources[$page_id] = Title::makeTitle($page_ns, $page_title);
                                        # Add groups needed for each restriction type if its not already there
                                        # Make sure this restriction type still exists
-                                       if ( isset($pagerestrictions[$row->pr_type]) && !in_array($row->pr_level, $pagerestrictions[$row->pr_type]) ) {
+                                       
+                                       if ( !isset( $pagerestrictions[$row->pr_type] ) ) {
+                                               $pagerestrictions[$row->pr_type] = array();
+                                       }
+                                       
+                                       if ( isset($pagerestrictions[$row->pr_type]) &&
+                                                       !in_array($row->pr_level, $pagerestrictions[$row->pr_type]) ) {
                                                $pagerestrictions[$row->pr_type][]=$row->pr_level;
                                        }
                                } else {
@@ -1820,11 +1871,23 @@ class Title {
         * Loads a string into mRestrictions array
         * @param $res \type{Resource} restrictions as an SQL result.
         */
-       private function loadRestrictionsFromRow( $res, $oldFashionedRestrictions = NULL ) {
-               global $wgRestrictionTypes;
+       private function loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions = NULL ) {
+               $rows = array();
                $dbr = wfGetDB( DB_SLAVE );
+               
+               while( $row = $dbr->fetchObject( $res ) ) {
+                       $rows[] = $row;
+               }
+               
+               $this->loadRestrictionsFromRows( $rows, $oldFashionedRestrictions );
+       }
+       
+       public function loadRestrictionsFromRows( $rows, $oldFashionedRestrictions = NULL ) {
+               $dbr = wfGetDB( DB_SLAVE );
+               
+               $restrictionTypes = $this->getRestrictionTypes();
 
-               foreach( $wgRestrictionTypes as $type ){
+               foreach( $restrictionTypes as $type ){
                        $this->mRestrictions[$type] = array();
                        $this->mRestrictionsExpiry[$type] = Block::decodeExpiry('');
                }
@@ -1855,16 +1918,17 @@ class Title {
 
                }
 
-               if( $dbr->numRows( $res ) ) {
+               if( count($rows) ) {
                        # Current system - load second to make them override.
                        $now = wfTimestampNow();
                        $purgeExpired = false;
 
-                       foreach( $res as $row ) {
+                       foreach( $rows as $row ) {
                                # Cycle through all the restrictions.
 
-                               // Don't take care of restrictions types that aren't in $wgRestrictionTypes
-                               if( !in_array( $row->pr_type, $wgRestrictionTypes ) )
+                               // Don't take care of restrictions types that aren't allowed
+                               
+                               if( !in_array( $row->pr_type, $restrictionTypes ) )
                                        continue;
 
                                // This code should be refactored, now that it's being used more generally,
@@ -1902,7 +1966,7 @@ class Title {
                                $res = $dbr->select( 'page_restrictions', '*',
                                        array ( 'pr_page' => $this->getArticleId() ), __METHOD__ );
 
-                               $this->loadRestrictionsFromRow( $res, $oldFashionedRestrictions );
+                               $this->loadRestrictionsFromResultWrapper( $res, $oldFashionedRestrictions );
                        } else {
                                $title_protection = $this->getTitleProtection();
 
@@ -2079,7 +2143,7 @@ class Title {
        /**
         * What is the page_latest field for this page?
         * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select for update
-        * @return \type{\int}
+        * @return \type{\int} or false if the page doesn't exist
         */
        public function getLatestRevID( $flags = 0 ) {
                if( $this->mLatestID !== false )
@@ -2105,7 +2169,7 @@ class Title {
                $linkCache->clearBadLink( $this->getPrefixedDBkey() );
 
                if ( $newid === false ) { $this->mArticleID = -1; }
-               else { $this->mArticleID = $newid; }
+               else { $this->mArticleID = intval( $newid ); }
                $this->mRestrictionsLoaded = false;
                $this->mRestrictions = array();
        }
@@ -2146,21 +2210,11 @@ class Title {
                }
                return $p . $name;
        }
-
-       /**
-        * Secure and split - main initialisation function for this object
-        *
-        * Assumes that mDbkeyform has been set, and is urldecoded
-        * and uses underscores, but not otherwise munged.  This function
-        * removes illegal characters, splits off the interwiki and
-        * namespace prefixes, sets the other forms, and canonicalizes
-        * everything.
-        * @return \type{\bool} true on success
-        */
-       private function secureAndSplit() {
-               global $wgContLang, $wgLocalInterwiki, $wgCapitalLinks;
-
-               # Initialisation
+       
+       // Returns a simple regex that will match on characters and sequences invalid in titles.
+       //  Note that this doesn't pick up many things that could be wrong with titles, but that
+       //  replacing this regex with something valid will make many titles valid.
+       static function getTitleInvalidRegex() {
                static $rxTc = false;
                if( !$rxTc ) {
                        # Matching titles will be held as illegal.
@@ -2176,6 +2230,37 @@ class Title {
                                '|&#x[0-9A-Fa-f]+;' .
                                '/S';
                }
+               
+               return $rxTc;
+       }
+       
+       /**
+        * Capitalize a text if it belongs to a namespace that capitalizes
+        */
+       public static function capitalize( $text, $ns = NS_MAIN ) {
+               global $wgContLang;
+               
+               if ( MWNamespace::isCapitalized( $ns ) )
+                       return $wgContLang->ucfirst( $text );
+               else
+                       return $text;
+       }
+
+       /**
+        * Secure and split - main initialisation function for this object
+        *
+        * Assumes that mDbkeyform has been set, and is urldecoded
+        * and uses underscores, but not otherwise munged.  This function
+        * removes illegal characters, splits off the interwiki and
+        * namespace prefixes, sets the other forms, and canonicalizes
+        * everything.
+        * @return \type{\bool} true on success
+        */
+       private function secureAndSplit() {
+               global $wgContLang, $wgLocalInterwiki;
+
+               # Initialisation
+               $rxTc = self::getTitleInvalidRegex();
 
                $this->mInterwiki = $this->mFragment = '';
                $this->mNamespace = $this->mDefaultNamespace; # Usually NS_MAIN
@@ -2188,8 +2273,11 @@ class Title {
                $dbkey = preg_replace( '/\xE2\x80[\x8E\x8F\xAA-\xAE]/S', '', $dbkey );
 
                # Clean up whitespace
+               # Note: use of the /u option on preg_replace here will cause
+               # input with invalid UTF-8 sequences to be nullified out in PHP 5.2.x,
+               # conveniently disabling them.
                #
-               $dbkey = preg_replace( '/[ _]+/', '_', $dbkey );
+               $dbkey = preg_replace( '/[ _\xA0\x{1680}\x{180E}\x{2000}-\x{200A}\x{2028}\x{2029}\x{202F}\x{205F}\x{3000}]+/u', '_', $dbkey );
                $dbkey = trim( $dbkey, '_' );
 
                if ( '' == $dbkey ) {
@@ -2331,8 +2419,8 @@ class Title {
                 * site might be case-sensitive.
                 */
                $this->mUserCaseDBKey = $dbkey;
-               if( $wgCapitalLinks && $this->mInterwiki == '') {
-                       $dbkey = $wgContLang->ucfirst( $dbkey );
+               if(  $this->mInterwiki == '') {
+                       $dbkey = self::capitalize( $dbkey, $this->mNamespace );
                }
 
                /**
@@ -2793,11 +2881,11 @@ class Title {
         */
        private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) {
                global $wgUseSquid, $wgUser;
-               $fname = 'Title::moveOverExistingRedirect';
+
                $comment = wfMsgForContent( '1movedto2_redir', $this->getPrefixedText(), $nt->getPrefixedText() );
 
                if ( $reason ) {
-                       $comment .= ": $reason";
+                       $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                }
 
                $now = wfTimestampNow();
@@ -2807,11 +2895,15 @@ class Title {
 
                $dbw = wfGetDB( DB_MASTER );
 
+               $rcts = $dbw->timestamp( $nt->getEarliestRevTime() );
+               $newns = $nt->getNamespace();
+               $newdbk = $nt->getDBkey();
+
                # Delete the old redirect. We don't save it to history since
                # by definition if we've got here it's rather uninteresting.
                # We have to remove it so that the next step doesn't trigger
                # a conflict on the unique namespace+title index...
-               $dbw->delete( 'page', array( 'page_id' => $newid ), $fname );
+               $dbw->delete( 'page', array( 'page_id' => $newid ), __METHOD__ );
                if ( !$dbw->cascadingDeletes() ) {
                        $dbw->delete( 'revision', array( 'rev_page' => $newid ), __METHOD__ );
                        global $wgUseTrackbacks;
@@ -2825,6 +2917,11 @@ class Title {
                        $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ );
                        $dbw->delete( 'redirect', array( 'rd_from' => $newid ), __METHOD__ );
                }
+               // If the redirect was recently created, it may have an entry in recentchanges still    
+               $dbw->delete( 'recentchanges', 
+                       array( 'rc_timestamp' => $rcts, 'rc_namespace' => $newns, 'rc_title' => $newdbk, 'rc_new' => 1 ), 
+                       __METHOD__
+               );
 
                # Save a null revision in the page's history notifying of the move
                $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
@@ -2842,7 +2939,7 @@ class Title {
                                'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
-                       $fname
+                       __METHOD__
                );
                $nt->resetArticleID( $oldid );
 
@@ -2863,13 +2960,13 @@ class Title {
 
                        # Now, we record the link from the redirect to the new title.
                        # It should have no other outgoing links...
-                       $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), $fname );
+                       $dbw->delete( 'pagelinks', array( 'pl_from' => $newid ), __METHOD__ );
                        $dbw->insert( 'pagelinks',
                                array(
                                        'pl_from'      => $newid,
                                        'pl_namespace' => $nt->getNamespace(),
                                        'pl_title'     => $nt->getDBkey() ),
-                               $fname );
+                               __METHOD__ );
                        $redirectSuppressed = false;
                } else {
                        $this->resetArticleID( 0 );
@@ -2898,7 +2995,7 @@ class Title {
         */
        private function moveToNewTitle( &$nt, $reason = '', $createRedirect = true ) {
                global $wgUseSquid, $wgUser;
-               $fname = 'MovePageForm::moveToNewTitle';
+
                $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
                if ( $reason ) {
                        $comment .= wfMsgExt( 'colon-separator',
@@ -2915,6 +3012,9 @@ class Title {
 
                # Save a null revision in the page's history notifying of the move
                $nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true );
+               if ( !is_object( $nullRevision ) ) {
+                       throw new MWException( 'No valid null revision produced in ' . __METHOD__ );
+               }
                $nullRevId = $nullRevision->insertOn( $dbw );
                
                $article = new Article( $this );
@@ -2929,7 +3029,7 @@ class Title {
                                'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
-                       $fname
+                       __METHOD__
                );
                $nt->resetArticleID( $oldid );
 
@@ -2954,7 +3054,7 @@ class Title {
                                        'pl_from'      => $newid,
                                        'pl_namespace' => $nt->getNamespace(),
                                        'pl_title'     => $nt->getDBkey() ),
-                               $fname );
+                               __METHOD__ );
                        $redirectSuppressed = false;
                } else {
                        $this->resetArticleID( 0 );
@@ -3009,13 +3109,18 @@ class Title {
                                break;
                        }
 
-                       if( $oldSubpage->getArticleId() == $this->getArticleId() )
+                       // We don't know whether this function was called before
+                       // or after moving the root page, so check both
+                       // $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(), '#' ).'#',
-                                       $nt->getDBkey(), $oldSubpage->getDBkey() );
+                                       str_replace( '\\', '\\\\', $nt->getDBkey() ), # bug 21234
+                                       $oldSubpage->getDBkey() );
                        if( $oldSubpage->isTalkPage() ) {
                                $newNs = $nt->getTalkPage()->getNamespace();
                        } else {
@@ -3298,7 +3403,7 @@ class Title {
         */
        public function countRevisionsBetween( $old, $new ) {
                $dbr = wfGetDB( DB_SLAVE );
-               return $dbr->selectField( 'revision', 'count(*)',
+               return (int)$dbr->selectField( 'revision', 'count(*)',
                        'rev_page = ' . intval( $this->getArticleId() ) .
                        ' AND rev_id > ' . intval( $old ) .
                        ' AND rev_id < ' . intval( $new ),
@@ -3515,40 +3620,29 @@ class Title {
         * Generate strings used for xml 'id' names in monobook tabs
         * @return \type{\string} XML 'id' name
         */
-       public function getNamespaceKey() {
+       public function getNamespaceKey( $prepend = 'nstab-' ) {
                global $wgContLang;
-               switch ($this->getNamespace()) {
-                       case NS_MAIN:
-                       case NS_TALK:
-                               return 'nstab-main';
-                       case NS_USER:
-                       case NS_USER_TALK:
-                               return 'nstab-user';
-                       case NS_MEDIA:
-                               return 'nstab-media';
-                       case NS_SPECIAL:
-                               return 'nstab-special';
-                       case NS_PROJECT:
-                       case NS_PROJECT_TALK:
-                               return 'nstab-project';
-                       case NS_FILE:
-                       case NS_FILE_TALK:
-                               return 'nstab-image';
-                       case NS_MEDIAWIKI:
-                       case NS_MEDIAWIKI_TALK:
-                               return 'nstab-mediawiki';
-                       case NS_TEMPLATE:
-                       case NS_TEMPLATE_TALK:
-                               return 'nstab-template';
-                       case NS_HELP:
-                       case NS_HELP_TALK:
-                               return 'nstab-help';
-                       case NS_CATEGORY:
-                       case NS_CATEGORY_TALK:
-                               return 'nstab-category';
-                       default:
-                               return 'nstab-' . $wgContLang->lc( $this->getSubjectNsText() );
+               // Gets the subject namespace if this title
+               $namespace = MWNamespace::getSubject( $this->getNamespace() );
+               // Checks if cononical namespace name exists for namespace
+               if ( MWNamespace::exists( $this->getNamespace() ) ) {
+                       // Uses canonical namespace name
+                       $namespaceKey = MWNamespace::getCanonicalName( $namespace );
+               } else {
+                       // Uses text of namespace
+                       $namespaceKey = $this->getSubjectNsText();
                }
+               // Makes namespace key lowercase
+               $namespaceKey = $wgContLang->lc( $namespaceKey );
+               // Uses main
+               if ( $namespaceKey == '' ) {
+                       $namespaceKey = 'main';
+               }
+               // Changes file to image for backwards compatibility
+               if ( $namespaceKey == 'file' ) {
+                       $namespaceKey = 'image';
+               }
+               return $prepend . $namespaceKey;
        }
 
        /**
@@ -3656,4 +3750,34 @@ class Title {
                }
                return $this->mBacklinkCache;
        }
+
+       /**
+        * Whether the magic words __INDEX__ and __NOINDEX__ function for
+        * this page.
+        * @return Bool
+        */
+       public function canUseNoindex(){
+               global $wgArticleRobotPolicies, $wgContentNamespaces,
+                      $wgExemptFromUserRobotsControl;
+
+               $bannedNamespaces = is_null( $wgExemptFromUserRobotsControl )
+                       ? $wgContentNamespaces
+                       : $wgExemptFromUserRobotsControl;
+
+               return !in_array( $this->mNamespace, $bannedNamespaces );
+
+       }
+       
+       public function getRestrictionTypes() {
+               global $wgRestrictionTypes;
+               $types = $this->exists() ? $wgRestrictionTypes : array('create');
+               
+               if ( $this->getNamespace() == NS_FILE ) {
+                       $types[] = 'upload';
+               }
+               
+               wfRunHooks( 'TitleGetRestrictionTypes', array( $this, &$types ) );
+                               
+               return $types;
+       }
 }