]> scripts.mit.edu Git - autoinstallsdev/mediawiki.git/blobdiff - includes/Title.php
MediaWiki 1.16.0
[autoinstallsdev/mediawiki.git] / includes / Title.php
index 515a3b6501065105f57f9199514c407407eda5f8..8d7275ff0d5d3a4895ab2194953335fde5cb35e7 100644 (file)
@@ -10,12 +10,6 @@ if ( !class_exists( 'UtfNormal' ) ) {
 
 define ( 'GAID_FOR_UPDATE', 1 );
 
-
-/**
- * Constants for pr_cascade bitfield
- */
-define( 'CASCADE', 1 );
-
 /**
  * Represents a title within MediaWiki.
  * Optionally may contain an interwiki designation or namespace.
@@ -44,31 +38,32 @@ class Title {
         */
        //@{
 
-       var $mTextform = '';              ///< Text form (spaces not underscores) of the main part
-       var $mUrlform = '';               ///< URL-encoded form of the main part
-       var $mDbkeyform = '';             ///< Main part with underscores
+       var $mTextform = '';              ///< Text form (spaces not underscores) of the main part
+       var $mUrlform = '';               ///< URL-encoded form of the main part
+       var $mDbkeyform = '';             ///< Main part with underscores
        var $mUserCaseDBKey;              ///< DB key with the initial letter in the case specified by the user
        var $mNamespace = NS_MAIN;        ///< Namespace index, i.e. one of the NS_xxxx constants
-       var $mInterwiki = '';             ///< Interwiki prefix (or null string)
-       var $mFragment;                   ///< Title fragment (i.e. the bit after the #)
+       var $mInterwiki = '';             ///< Interwiki prefix (or null string)
+       var $mFragment;                   ///< Title fragment (i.e. the bit after the #)
        var $mArticleID = -1;             ///< Article ID, fetched from the link cache on demand
        var $mLatestID = false;           ///< ID of most recent revision
        var $mRestrictions = array();     ///< Array of groups allowed to edit this article
        var $mOldRestrictions = false;
-       var $mCascadeRestriction;         ///< Cascade restrictions on this page to included templates and images?
-       var $mRestrictionsExpiry = array();       ///< When do the restrictions on this page expire?
-       var $mHasCascadingRestrictions;   ///< Are cascading restrictions in effect on this page?
-       var $mCascadeSources;  ///< Where are the cascading restrictions coming from on this page?
+       var $mCascadeRestriction;         ///< Cascade restrictions on this page to included templates and images?
+       var $mRestrictionsExpiry = array(); ///< When do the restrictions on this page expire?
+       var $mHasCascadingRestrictions;   ///< Are cascading restrictions in effect on this page?
+       var $mCascadeSources;             ///< Where are the cascading restrictions coming from on this page?
        var $mRestrictionsLoaded = false; ///< Boolean for initialisation on demand
-       var $mPrefixedText;               ///< Text form including namespace/interwiki, initialised on demand
+       var $mPrefixedText;               ///< Text form including namespace/interwiki, initialised on demand
        # Don't change the following default, NS_MAIN is hardcoded in several
        # places.  See bug 696.
        var $mDefaultNamespace = NS_MAIN; ///< Namespace index when there is no namespace
-                                         # Zero except in {{transclusion}} tags
-       var $mWatched = null;             ///< Is $wgUser watching this page? null if unfilled, accessed through userIsWatching()
+                                         # Zero except in {{transclusion}} tags
+       var $mWatched = null;             ///< Is $wgUser watching this page? null if unfilled, accessed through userIsWatching()
        var $mLength = -1;                ///< The page length, 0 for special pages
        var $mRedirect = null;            ///< Is the article at this title a redirect?
        var $mNotificationTimestamp = array(); ///< Associative array of user ID -> timestamp/false
+       var $mBacklinkCache = null;       ///< Cache of links to this title
        //@}
 
 
@@ -91,7 +86,7 @@ class Title {
                if( $t->secureAndSplit() )
                        return $t;
                else
-                       return NULL;
+                       return null;
        }
 
        /**
@@ -145,12 +140,20 @@ class Title {
                        }
                        return $t;
                } else {
-                       $ret = NULL;
+                       $ret = null;
                        return $ret;
                }
        }
 
        /**
+        * THIS IS NOT THE FUNCTION YOU WANT. Use Title::newFromText().
+        *
+        * Example of wrong and broken code:
+        * $title = Title::newFromURL( $wgRequest->getVal( 'title' ) );
+        *
+        * Example of right code:
+        * $title = Title::newFromText( $wgRequest->getVal( 'title' ) );
+        *
         * Create a new Title from URL-encoded text. Ensures that
         * the given title's length does not exceed the maximum.
         * @param $url \type{\string} the title, as might be taken from a URL
@@ -171,29 +174,24 @@ class Title {
                if( $t->secureAndSplit() ) {
                        return $t;
                } else {
-                       return NULL;
+                       return null;
                }
        }
 
        /**
         * Create a new Title from an article ID
         *
-        * @todo This is inefficiently implemented, the page row is requested
-        *       but not used for anything else
-        *
         * @param $id \type{\int} the page_id corresponding to the Title to create
         * @param $flags \type{\int} use GAID_FOR_UPDATE to use master
         * @return \type{Title} the new object, or NULL on an error
         */
        public static function newFromID( $id, $flags = 0 ) {
-               $fname = 'Title::newFromID';
                $db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
-               $row = $db->selectRow( 'page', array( 'page_namespace', 'page_title' ),
-                       array( 'page_id' => $id ), $fname );
-               if ( $row !== false ) {
-                       $title = Title::makeTitle( $row->page_namespace, $row->page_title );
+               $row = $db->selectRow( 'page', '*', array( 'page_id' => $id ), __METHOD__ );
+               if( $row !== false ) {
+                       $title = Title::newFromRow( $row );
                } else {
-                       $title = NULL;
+                       $title = null;
                }
                return $title;
        }
@@ -228,7 +226,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->mRedirect = isset($row->page_is_redirect) ? (bool)$row->page_is_redirect : null;
                $t->mLatestID = isset($row->page_latest) ? $row->page_latest : false;
 
                return $t;
@@ -274,9 +272,9 @@ class Title {
                if( $t->secureAndSplit() ) {
                        return $t;
                } else {
-                       return NULL;
+                       return null;
                }
-       }
+       }
 
        /**
         * Create a new Title for the Main Page
@@ -294,11 +292,77 @@ class Title {
        /**
         * Extract a redirect destination from a string and return the
         * Title, or null if the text doesn't contain a valid redirect
+        * This will only return the very next target, useful for
+        * the redirect table and other checks that don't need full recursion
         *
-        * @param $text \type{String} Text with possible redirect
+        * @param $text \type{\string} Text with possible redirect
         * @return \type{Title} The corresponding Title
         */
        public static function newFromRedirect( $text ) {
+               return self::newFromRedirectInternal( $text );
+       }
+
+       /**
+        * Extract a redirect destination from a string and return the
+        * Title, or null if the text doesn't contain a valid redirect
+        * This will recurse down $wgMaxRedirects times or until a non-redirect target is hit
+        * in order to provide (hopefully) the Title of the final destination instead of another redirect
+        *
+        * @param $text \type{\string} Text with possible redirect
+        * @return \type{Title} The corresponding Title
+        */
+       public static function newFromRedirectRecurse( $text ) {
+               $titles = self::newFromRedirectArray( $text );
+               return $titles ? array_pop( $titles ) : null;
+       }
+
+       /**
+        * Extract a redirect destination from a string and return an
+        * array of Titles, or null if the text doesn't contain a valid redirect
+        * The last element in the array is the final destination after all redirects
+        * have been resolved (up to $wgMaxRedirects times)
+        *
+        * @param $text \type{\string} Text with possible redirect
+        * @return \type{\array} Array of Titles, with the destination last
+        */
+       public static function newFromRedirectArray( $text ) {
+               global $wgMaxRedirects;
+               // are redirects disabled?
+               if( $wgMaxRedirects < 1 )
+                       return null;
+               $title = self::newFromRedirectInternal( $text );
+               if( is_null( $title ) )
+                       return null;
+               // recursive check to follow double redirects
+               $recurse = $wgMaxRedirects;
+               $titles = array( $title );
+               while( --$recurse > 0 ) {
+                       if( $title->isRedirect() ) {
+                               $article = new Article( $title, 0 );
+                               $newtitle = $article->getRedirectTarget();
+                       } else {
+                               break;
+                       }
+                       // Redirects to some special pages are not permitted
+                       if( $newtitle instanceOf Title && $newtitle->isValidRedirectTarget() ) {
+                               // the new title passes the checks, so make that our current title so that further recursion can be checked
+                               $title = $newtitle;
+                               $titles[] = $newtitle;
+                       } else {
+                               break;
+                       }
+               }
+               return $titles;
+       }
+
+       /**
+        * Really extract the redirect destination
+        * Do not call this function directly, use one of the newFromRedirect* functions above
+        *
+        * @param $text \type{\string} Text with possible redirect
+        * @return \type{Title} The corresponding Title
+        */
+       protected static function newFromRedirectInternal( $text ) {
                $redir = MagicWord::get( 'redirect' );
                $text = trim($text);
                if( $redir->matchStartAndRemove( $text ) ) {
@@ -316,13 +380,11 @@ class Title {
                                        $m[1] = urldecode( ltrim( $m[1], ':' ) );
                                }
                                $title = Title::newFromText( $m[1] );
-                               // Redirects to some special pages are not permitted
-                               if( $title instanceof Title 
-                                               && !$title->isSpecial( 'Userlogout' )
-                                               && !$title->isSpecial( 'Filepath' ) ) 
-                               {
-                                       return $title;
+                               // If the title is a redirect to bad special pages or is invalid, return null
+                               if( !$title instanceof Title || !$title->isValidRedirectTarget() ) {
+                                       return null;
                                }
+                               return $title;
                        }
                }
                return null;
@@ -336,16 +398,16 @@ class Title {
         * Get the prefixed DB key associated with an ID
         * @param $id \type{\int} the page_id of the article
         * @return \type{Title} an object representing the article, or NULL
-        *      if no such article was found
+        *  if no such article was found
         */
        public static function nameOf( $id ) {
                $dbr = wfGetDB( DB_SLAVE );
 
                $s = $dbr->selectRow( 'page',
                        array( 'page_namespace','page_title' ),
-                       array( 'page_id' => $id ), 
+                       array( 'page_id' => $id ),
                        __METHOD__ );
-               if ( $s === false ) { return NULL; }
+               if ( $s === false ) { return null; }
 
                $n = self::makeName( $s->page_namespace, $s->page_title );
                return $n;
@@ -367,13 +429,13 @@ class Title {
         * @param $ns \type{\int} a namespace index
         * @param $title \type{\string} text-form main part
         * @return \type{\string} a stripped-down title string ready for the
-        *      search index
+        *  search index
         */
        public static function indexTitle( $ns, $title ) {
                global $wgContLang;
 
                $lc = SearchEngine::legalSearchChars() . '&#;';
-               $t = $wgContLang->stripForSearch( $title );
+               $t = $wgContLang->normalizeForSearch( $title );
                $t = preg_replace( "/[^{$lc}]+/", ' ', $t );
                $t = $wgContLang->lc( $t );
 
@@ -389,7 +451,7 @@ class Title {
                return trim( $t );
        }
 
-       /*
+       /**
         * Make a prefixed DB key from a DB key and a namespace index
         * @param $ns \type{\int} numerical representation of the namespace
         * @param $title \type{\string} the DB key form the title
@@ -407,18 +469,6 @@ class Title {
                return $name;
        }
 
-       /**
-        * Returns the URL associated with an interwiki prefix
-        * @param $key \type{\string} the interwiki prefix (e.g. "MeatBall")
-        * @return \type{\string} the associated URL, containing "$1", 
-        *      which should be replaced by an article title
-        * @static (arguably)
-        * @deprecated See Interwiki class
-        */
-       public function getInterwikiLink( $key )  {
-               return Interwiki::fetch( $key )->getURL( );
-       }
-
        /**
         * Determine whether the object refers to a page within
         * this project.
@@ -443,7 +493,7 @@ class Title {
        public function isTrans() {
                if ($this->mInterwiki == '')
                        return false;
-               
+
                return Interwiki::fetch( $this->mInterwiki )->isTranscludable();
        }
 
@@ -451,13 +501,11 @@ class Title {
         * Escape a text fragment, say from a link, for a URL
         */
        static function escapeFragmentForURL( $fragment ) {
-               global $wgEnforceHtmlIds;
                # Note that we don't urlencode the fragment.  urlencoded Unicode
                # fragments appear not to work in IE (at least up to 7) or in at least
                # one version of Opera 9.x.  The W3C validator, for one, doesn't seem
                # to care if they aren't encoded.
-               return Sanitizer::escapeId( $fragment,
-                       $wgEnforceHtmlIds ? 'noninitial' : 'xml' );
+               return Sanitizer::escapeId( $fragment, 'noninitial' );
        }
 
 #----------------------------------------------------------------------------
@@ -490,17 +538,17 @@ class Title {
         * @return \type{\string} Namespace text
         */
        public function getNsText() {
-               global $wgContLang, $wgCanonicalNamespaceNames;
+               global $wgContLang;
 
-               if ( '' != $this->mInterwiki ) {
+               if ( $this->mInterwiki != '' ) {
                        // This probably shouldn't even happen. ohh man, oh yuck.
                        // But for interwiki transclusion it sometimes does.
                        // Shit. Shit shit shit.
                        //
                        // 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 );
@@ -565,7 +613,7 @@ class Title {
        /**
         * Get title for search index
         * @return \type{\string} a stripped-down title string ready for the
-        *      search index
+        *  search index
         */
        public function getIndexTitle() {
                return Title::indexTitle( $this->mNamespace, $this->mTextform );
@@ -574,7 +622,7 @@ class Title {
        /**
         * Get the prefixed database key form
         * @return \type{\string} the prefixed title, with underscores and
-        *      any interwiki and namespace prefixes
+        *  any interwiki and namespace prefixes
         */
        public function getPrefixedDBkey() {
                $s = $this->prefix( $this->mDbkeyform );
@@ -600,11 +648,11 @@ class Title {
         * Get the prefixed title with spaces, plus any fragment
         * (part beginning with '#')
         * @return \type{\string} the prefixed title, with spaces and
-        *      the fragment, including '#'
+        *  the fragment, including '#'
         */
        public function getFullText() {
                $text = $this->getPrefixedText();
-               if( '' != $this->mFragment ) {
+               if( $this->mFragment != '' ) {
                        $text .= '#' . $this->mFragment;
                }
                return $text;
@@ -677,7 +725,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.
@@ -688,7 +736,7 @@ class Title {
                        $baseUrl = $interwiki->getURL( );
 
                        $namespace = wfUrlencode( $this->getNsText() );
-                       if ( '' != $namespace ) {
+                       if ( $namespace != '' ) {
                                # Can this actually happen? Interwikis shouldn't be parsed.
                                # Yes! It can in interwiki transclusion. But... it probably shouldn't.
                                $namespace .= ':';
@@ -708,7 +756,7 @@ class Title {
         * Get a URL with no fragment or server name.  If this page is generated
         * with action=render, $wgServer is prepended.
         * @param mixed $query an optional query string; if not specified,
-        *       $wgArticlePath will be used.  Can be specified as an associative array
+        *   $wgArticlePath will be used.  Can be specified as an associative array
         *   as well, e.g., array( 'action' => 'edit' ) (keys and values will be
         *   URL-escaped).
         * @param $variant \type{\string} language variant of url (for sr, zh..)
@@ -794,6 +842,9 @@ class Title {
         * there's a fragment but the prefixed text is empty, we just return a link
         * to the fragment.
         *
+        * The result obviously should not be URL-escaped, but does need to be
+        * HTML-escaped if it's being output in HTML.
+        *
         * @param $query \type{\arrayof{\string}} An associative array of key => value pairs for the
         *   query string.  Keys and values will be escaped.
         * @param $variant \type{\string} Language variant of URL (for sr, zh..).  Ignored
@@ -802,19 +853,16 @@ class Title {
         * @return \type{\string} the URL
         */
        public function getLinkUrl( $query = array(), $variant = false ) {
-               if( !is_array( $query ) ) {
-                       throw new MWException( 'Title::getLinkUrl passed a non-array for '.
-                       '$query' );
-               }
+               wfProfileIn( __METHOD__ );
                if( $this->isExternal() ) {
-                       return $this->getFullURL( $query );
-               } elseif( $this->getPrefixedText() === ''
-               and $this->getFragment() !== '' ) {
-                       return $this->getFragmentForURL();
+                       $ret = $this->getFullURL( $query );
+               } elseif( $this->getPrefixedText() === '' && $this->getFragment() !== '' ) {
+                       $ret = $this->getFragmentForURL();
                } else {
-                       return $this->getLocalURL( $query, $variant )
-                               . $this->getFragmentForURL();
+                       $ret = $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL();
                }
+               wfProfileOut( __METHOD__ );
+               return $ret;
        }
 
        /**
@@ -857,10 +905,10 @@ class Title {
        /**
         * Get the edit URL for this Title
         * @return \type{\string} the URL, or a null string if this is an
-        *      interwiki link
+        *  interwiki link
         */
        public function getEditURL() {
-               if ( '' != $this->mInterwiki ) { return ''; }
+               if ( $this->mInterwiki != '' ) { return ''; }
                $s = $this->getLocalURL( 'action=edit' );
 
                return $s;
@@ -879,7 +927,7 @@ class Title {
         * Is this Title interwiki?
         * @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?
@@ -909,18 +957,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 ) {
@@ -934,6 +984,19 @@ class Title {
                return false;
        }
 
+       /**
+        * Is this a conversion table for the LanguageConverter?
+        * @return \type{\bool}
+        */
+       public function isConversionTable() {
+               if($this->getNamespace() == NS_MEDIAWIKI
+                  && strpos( $this->getText(), 'Conversiontable' ) !== false ) {
+                       return true;
+               }
+
+               return false;
+       }
+
        /**
         * Is $wgUser watching this page?
         * @return \type{\bool}
@@ -953,7 +1016,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.
@@ -962,7 +1026,7 @@ class Title {
         *
         * @param $action \type{\string} action that permission needs to be checked for
         * @return \type{\bool}
-        */
+        */
        public function quickUserCan( $action ) {
                return $this->userCan( $action, false );
        }
@@ -989,10 +1053,10 @@ class Title {
         * @param $action \type{\string} action that permission needs to be checked for
         * @param $doExpensiveQueries \type{\bool} Set this to false to avoid doing unnecessary queries.
         * @return \type{\bool}
-        */
+        */
        public function userCan( $action, $doExpensiveQueries = true ) {
                global $wgUser;
-               return ( $this->getUserPermissionsErrorsInternal( $action, $wgUser, $doExpensiveQueries ) === array());
+               return ($this->getUserPermissionsErrorsInternal( $action, $wgUser, $doExpensiveQueries, true ) === array());
        }
 
        /**
@@ -1024,7 +1088,7 @@ class Title {
                }
 
                // Edit blocks should not affect reading. Account creation blocks handled at userlogin.
-               if ( $user->isBlockedFrom( $this ) && $action != 'read' && $action != 'createaccount' ) {
+               if ( $action != 'read' && $action != 'createaccount' && $user->isBlockedFrom( $this ) ) {
                        $block = $user->mBlock;
 
                        // This is from OutputPage::blockedPage
@@ -1069,15 +1133,15 @@ class Title {
 
                        $intended = $user->mBlock->mAddress;
 
-                       $errors[] = array( ($block->mAuto ? 'autoblockedtext' : 'blockedtext'), $link, $reason, $ip, $name, 
+                       $errors[] = array( ($block->mAuto ? 'autoblockedtext' : 'blockedtext'), $link, $reason, $ip, $name,
                                $blockid, $blockExpiry, $intended, $blockTimestamp );
                }
-               
+
                // Remove the errors being ignored.
-               
+
                foreach( $errors as $index => $error ) {
                        $error_key = is_array($error) ? $error[0] : $error;
-                       
+
                        if (in_array( $error_key, $ignoreErrors )) {
                                unset($errors[$index]);
                        }
@@ -1094,19 +1158,93 @@ class Title {
         * @param $action \type{\string} action that permission needs to be checked for
         * @param $user \type{User} user to check
         * @param $doExpensiveQueries \type{\bool} Set this to false to avoid doing unnecessary queries.
+        * @param $short \type{\bool} Set this to true to stop after the first permission error.
         * @return \type{\array} Array of arrays of the arguments to wfMsg to explain permissions problems.
         */
-       private function getUserPermissionsErrorsInternal( $action, $user, $doExpensiveQueries = true ) {
+       private function getUserPermissionsErrorsInternal( $action, $user, $doExpensiveQueries=true, $short=false ) {
                wfProfileIn( __METHOD__ );
 
                $errors = array();
 
+               // First stop is permissions checks, which fail most often, and which are easiest to test.
+               if ( $action == 'move' ) {
+                       if( !$user->isAllowed( 'move-rootuserpages' )
+                                       && $this->getNamespace() == NS_USER && !$this->isSubpage() )
+                       {
+                               // Show user page-specific message only if the user can move other pages
+                               $errors[] = array( 'cant-move-user-page' );
+                       }
+
+                       // Check if user is allowed to move files if it's a file
+                       if( $this->getNamespace() == NS_FILE && !$user->isAllowed( 'movefile' ) ) {
+                               $errors[] = array( 'movenotallowedfile' );
+                       }
+
+                       if( !$user->isAllowed( 'move' ) ) {
+                               // User can't move anything
+                               global $wgGroupPermissions;
+                               $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 {
+                                       $errors[] = array ('movenotallowed');
+                               }
+                       }
+               } elseif ( $action == 'create' ) {
+                       if( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
+                               ( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) )
+                       {
+                               $errors[] = $user->isAnon() ? array ('nocreatetext') : array ('nocreate-loggedin');
+                       }
+               } elseif( $action == 'move-target' ) {
+                       if( !$user->isAllowed( 'move' ) ) {
+                               // User can't move anything
+                               $errors[] = array ('movenotallowed');
+                       } elseif( !$user->isAllowed( 'move-rootuserpages' )
+                               && $this->getNamespace() == NS_USER && !$this->isSubpage() )
+                       {
+                               // Show user page-specific message only if the user can move other pages
+                               $errors[] = array( 'cant-move-to-user-page' );
+                       }
+               } elseif( !$user->isAllowed( $action ) ) {
+                       $return = null;
+
+                       // 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 ) ) );
+                       } else {
+                               $return = array( "badaccess-group0" );
+                       }
+                       $errors[] = $return;
+               }
+
+               # Short-circuit point
+               if( $short && count($errors) > 0 ) {
+                       wfProfileOut( __METHOD__ );
+                       return $errors;
+               }
+
                // Use getUserPermissionsErrors instead
                if( !wfRunHooks( 'userCan', array( &$this, &$user, $action, &$result ) ) ) {
                        wfProfileOut( __METHOD__ );
                        return $result ? array() : array( array( 'badaccess-group0' ) );
                }
-
+               // Check getUserPermissionsErrors hook
                if( !wfRunHooks( 'getUserPermissionsErrors', array(&$this,&$user,$action,&$result) ) ) {
                        if( is_array($result) && count($result) && !is_array($result[0]) )
                                $errors[] = $result; # A single array representing an error
@@ -1117,6 +1255,12 @@ class Title {
                        else if( $result === false )
                                $errors[] = array('badaccess-group0'); # a generic "We don't want them to do that"
                }
+               # Short-circuit point
+               if( $short && count($errors) > 0 ) {
+                       wfProfileOut( __METHOD__ );
+                       return $errors;
+               }
+               // Check getUserPermissionsErrorsExpensive hook
                if( $doExpensiveQueries && !wfRunHooks( 'getUserPermissionsErrorsExpensive', array(&$this,&$user,$action,&$result) ) ) {
                        if( is_array($result) && count($result) && !is_array($result[0]) )
                                $errors[] = $result; # A single array representing an error
@@ -1127,13 +1271,20 @@ class Title {
                        else if( $result === false )
                                $errors[] = array('badaccess-group0'); # a generic "We don't want them to do that"
                }
-               
-               // TODO: document
+               # Short-circuit point
+               if( $short && count($errors) > 0 ) {
+                       wfProfileOut( __METHOD__ );
+                       return $errors;
+               }
+
+               # Only 'createaccount' and 'execute' can be performed on
+               # special pages, which don't actually exist in the DB.
                $specialOKActions = array( 'createaccount', 'execute' );
                if( NS_SPECIAL == $this->mNamespace && !in_array( $action, $specialOKActions) ) {
                        $errors[] = array('ns-specialprotected');
                }
 
+               # Check $wgNamespaceProtection for restricted namespaces
                if( $this->isNamespaceProtected() ) {
                        $ns = $this->getNamespace() == NS_MAIN ?
                                wfMsg( 'nstab-main' ) : $this->getNsText();
@@ -1141,15 +1292,49 @@ class Title {
                                array('protectedinterface') : array( 'namespaceprotected',  $ns );
                }
 
-               # protect css/js subpages of user pages
+               # 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');
                }
 
+               # Check against page_restrictions table requirements on this
+               # page. The user must possess all required rights for this action.
+               foreach( $this->getRestrictions($action) as $right ) {
+                       // Backwards compatibility, rewrite sysop -> protect
+                       if( $right == 'sysop' ) {
+                               $right = 'protect';
+                       }
+                       if( $right != '' && !$user->isAllowed( $right ) ) {
+                               // Users with 'editprotected' permission can edit protected pages
+                               if( $action=='edit' && $user->isAllowed( 'editprotected' ) ) {
+                                       // Users with 'editprotected' permission cannot edit protected pages
+                                       // with cascading option turned on.
+                                       if( $this->mCascadeRestriction ) {
+                                               $errors[] = array( 'protectedpagetext', $right );
+                                       }
+                               } else {
+                                       $errors[] = array( 'protectedpagetext', $right );
+                               }
+                       }
+               }
+               # Short-circuit point
+               if( $short && count($errors) > 0 ) {
+                       wfProfileOut( __METHOD__ );
+                       return $errors;
+               }
+
                if( $doExpensiveQueries && !$this->isCssJsSubpage() ) {
                        # We /could/ use the protection level on the source page, but it's fairly ugly
                        #  as we have to establish a precedence hierarchy for pages included by multiple
@@ -1163,7 +1348,7 @@ class Title {
                        if( $cascadingSources > 0 && isset($restrictions[$action]) ) {
                                foreach( $restrictions[$action] as $right ) {
                                        $right = ( $right == 'sysop' ) ? 'protect' : $right;
-                                       if( '' != $right && !$user->isAllowed( $right ) ) {
+                                       if( $right != '' && !$user->isAllowed( $right ) ) {
                                                $pages = '';
                                                foreach( $cascadingSources as $page )
                                                        $pages .= '* [[:' . $page->getPrefixedText() . "]]\n";
@@ -1172,26 +1357,10 @@ class Title {
                                }
                        }
                }
-
-               foreach( $this->getRestrictions($action) as $right ) {
-                       // Backwards compatibility, rewrite sysop -> protect
-                       if( $right == 'sysop' ) {
-                               $right = 'protect';
-                       }
-                       if( '' != $right && !$user->isAllowed( $right ) ) {
-                               // Users with 'editprotected' permission can edit protected pages
-                               if( $action=='edit' && $user->isAllowed( 'editprotected' ) ) {
-                                       // Users with 'editprotected' permission cannot edit protected pages
-                                       // with cascading option turned on.
-                                       if( $this->mCascadeRestriction ) {
-                                               $errors[] = array( 'protectedpagetext', $right );
-                                       } else {
-                                               // Nothing, user can edit!
-                                       }
-                               } else {
-                                       $errors[] = array( 'protectedpagetext', $right );
-                               }
-                       }
+               # Short-circuit point
+               if( $short && count($errors) > 0 ) {
+                       wfProfileOut( __METHOD__ );
+                       return $errors;
                }
 
                if( $action == 'protect' ) {
@@ -1212,26 +1381,7 @@ class Title {
                                        $errors[] = array( 'titleprotected', User::whoIs($pt_user), $pt_reason );
                                }
                        }
-
-                       if( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
-                               ( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) 
-                       {
-                               $errors[] = $user->isAnon() ? array ('nocreatetext') : array ('nocreate-loggedin');
-                       }
                } elseif( $action == 'move' ) {
-                       if( !$user->isAllowed( 'move' ) ) {
-                               // User can't move anything
-                               $errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
-                       } elseif( !$user->isAllowed( 'move-rootuserpages' ) 
-                                       && $this->getNamespace() == NS_USER && !$this->isSubpage() ) 
-                       {
-                               // Show user page-specific message only if the user can move other pages
-                               $errors[] = array( 'cant-move-user-page' );
-                       }
-                       // Check if user is allowed to move files if it's a file
-                       if( $this->getNamespace() == NS_FILE && !$user->isAllowed( 'movefile' ) ) {
-                               $errors[] = array( 'movenotallowedfile' );
-                       }
                        // Check for immobile pages
                        if( !MWNamespace::isMovable( $this->getNamespace() ) ) {
                                // Specific message for this case
@@ -1241,31 +1391,11 @@ class Title {
                                $errors[] = array( 'immobile-page' );
                        }
                } elseif( $action == 'move-target' ) {
-                       if( !$user->isAllowed( 'move' ) ) {
-                               // User can't move anything
-                               $errors[] = $user->isAnon() ? array ( 'movenologintext' ) : array ('movenotallowed');
-                       } elseif( !$user->isAllowed( 'move-rootuserpages' ) 
-                               && $this->getNamespace() == NS_USER && !$this->isSubpage() ) 
-                       {
-                               // Show user page-specific message only if the user can move other pages
-                               $errors[] = array( 'cant-move-to-user-page' );
-                       }
                        if( !MWNamespace::isMovable( $this->getNamespace() ) ) {
                                $errors[] = array( 'immobile-target-namespace', $this->getNsText() );
                        } elseif( !$this->isMovable() ) {
                                $errors[] = array( 'immobile-target-page' );
                        }
-               } elseif( !$user->isAllowed( $action ) ) {
-                       $return = null;
-                       $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
-                               User::getGroupsWithPermission( $action ) );
-                       if( $groups ) {
-                               $return = array( 'badaccess-groups',
-                                       array( implode( ', ', $groups ), count( $groups ) ) );
-                       } else {
-                               $return = array( "badaccess-group0" );
-                       }
-                       $errors[] = $return;
                }
 
                wfProfileOut( __METHOD__ );
@@ -1283,6 +1413,11 @@ class Title {
                        return false;
                }
 
+               // Can't protect pages that exist.
+               if ($this->exists()) {
+                       return false;
+               }
+
                $dbr = wfGetDB( DB_SLAVE );
                $res = $dbr->select( 'protected_titles', '*',
                        array( 'pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey() ),
@@ -1318,32 +1453,40 @@ 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' ).')';
                }
-       
+
                # 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( $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;
@@ -1356,37 +1499,10 @@ class Title {
                $dbw = wfGetDB( DB_MASTER );
 
                $dbw->delete( 'protected_titles',
-                       array( 'pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey() ), 
+                       array( 'pt_namespace' => $this->getNamespace(), 'pt_title' => $this->getDBkey() ),
                        __METHOD__ );
        }
 
-       /**
-        * Can $wgUser edit this page?
-        * @return \type{\bool} TRUE or FALSE
-        * @deprecated use userCan('edit')
-        */
-       public function userCanEdit( $doExpensiveQueries = true ) {
-               return $this->userCan( 'edit', $doExpensiveQueries );
-       }
-
-       /**
-        * Can $wgUser create this page?
-        * @return \type{\bool} TRUE or FALSE
-        * @deprecated use userCan('create')
-        */
-       public function userCanCreate( $doExpensiveQueries = true ) {
-               return $this->userCan( 'create', $doExpensiveQueries );
-       }
-
-       /**
-        * Can $wgUser move this page?
-        * @return \type{\bool} TRUE or FALSE
-        * @deprecated use userCan('move')
-        */
-       public function userCanMove( $doExpensiveQueries = true ) {
-               return $this->userCan( 'move', $doExpensiveQueries );
-       }
-
        /**
         * Would anybody with sufficient privileges be able to move this page?
         * Some pages just aren't movable.
@@ -1405,6 +1521,32 @@ class Title {
        public function userCanRead() {
                global $wgUser, $wgGroupPermissions;
 
+               static $useShortcut = null;
+
+               # Initialize the $useShortcut boolean, to determine if we can skip quite a bit of code below
+               if( is_null( $useShortcut ) ) {
+                       global $wgRevokePermissions;
+                       $useShortcut = true;
+                       if( empty( $wgGroupPermissions['*']['read'] ) ) {
+                               # Not a public wiki, so no shortcut
+                               $useShortcut = false;
+                       } elseif( !empty( $wgRevokePermissions ) ) {
+                               /*
+                                * 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;
+                                       }
+                               }
+                       }
+               }
+
                $result = null;
                wfRunHooks( 'userCan', array( &$this, &$wgUser, 'read', &$result ) );
                if ( $result !== null ) {
@@ -1412,7 +1554,7 @@ class Title {
                }
 
                # Shortcut for public wikis, allows skipping quite a bit of code
-               if ($wgGroupPermissions['*']['read'])
+               if ( $useShortcut )
                        return true;
 
                if( $wgUser->isAllowed( 'read' ) ) {
@@ -1510,11 +1652,35 @@ class Title {
                        return $this->mHasSubpages;
                }
 
-               $db = wfGetDB( DB_SLAVE );
-               return $this->mHasSubpages = (bool)$db->selectField( 'page', '1',
-                       "page_namespace = {$this->mNamespace} AND page_title LIKE '"
-                       . $db->escapeLike( $this->mDbkeyform ) . "/%'",
-                       __METHOD__
+               $subpages = $this->getSubpages( 1 );
+               if( $subpages instanceof TitleArray )
+                       return $this->mHasSubpages = (bool)$subpages->count();
+               return $this->mHasSubpages = false;
+       }
+
+       /**
+        * Get all subpages of this page.
+        * @param $limit Maximum number of subpages to fetch; -1 for no limit
+        * @return mixed TitleArray, or empty array if this page's namespace
+        *  doesn't allow subpages
+        */
+       public function getSubpages( $limit = -1 ) {
+               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 )
+                       $options['LIMIT'] = $limit;
+               return $this->mSubpages = TitleArray::newFromResult(
+                       $dbr->select( 'page',
+                               array( 'page_id', 'page_namespace', 'page_title', 'page_is_redirect' ),
+                               $conds,
+                               __METHOD__,
+                               $options
+                       )
                );
        }
 
@@ -1572,15 +1738,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 userCanEditCssSubpage() {
+               global $wgUser;
+               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 userCanEditCssJsSubpage() {
+       public function userCanEditJsSubpage() {
                global $wgUser;
-               return ( $wgUser->isAllowed('editusercssjs') || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
+               return ( ( $wgUser->isAllowed('editusercssjs') && $wgUser->isAllowed('edituserjs') )
+                      || preg_match('/^'.preg_quote($wgUser->getName(), '/').'\//', $this->mTextform) );
        }
 
        /**
@@ -1597,17 +1776,12 @@ class Title {
         * Cascading protection: Get the source of any cascading restrictions on this page.
         *
         * @param $get_pages \type{\bool} Whether or not to retrieve the actual pages that the restrictions have come from.
-        * @return \type{\arrayof{mixed title array, restriction array}} Array of the Title objects of the pages from 
+        * @return \type{\arrayof{mixed title array, restriction array}} Array of the Title objects of the pages from
         *         which cascading restrictions have come, false for none, or true if such restrictions exist, but $get_pages was not set.
         *         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 );
@@ -1658,7 +1832,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 {
@@ -1696,11 +1876,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 );
 
-               foreach( $wgRestrictionTypes as $type ){
+               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( $restrictionTypes as $type ){
                        $this->mRestrictions[$type] = array();
                        $this->mRestrictionsExpiry[$type] = Block::decodeExpiry('');
                }
@@ -1709,8 +1901,8 @@ class Title {
 
                # Backwards-compatibility: also load the restrictions from the page record (old format).
 
-               if ( $oldFashionedRestrictions === NULL ) {
-                       $oldFashionedRestrictions = $dbr->selectField( 'page', 'page_restrictions', 
+               if ( $oldFashionedRestrictions === null ) {
+                       $oldFashionedRestrictions = $dbr->selectField( 'page', 'page_restrictions',
                                array( 'page_id' => $this->getArticleId() ), __METHOD__ );
                }
 
@@ -1731,16 +1923,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,
@@ -1770,7 +1963,7 @@ class Title {
        /**
         * Load restrictions from the page_restrictions table
         */
-       public function loadRestrictions( $oldFashionedRestrictions = NULL ) {
+       public function loadRestrictions( $oldFashionedRestrictions = null ) {
                if( !$this->mRestrictionsLoaded ) {
                        if ($this->exists()) {
                                $dbr = wfGetDB( DB_SLAVE );
@@ -1778,7 +1971,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();
 
@@ -1834,7 +2027,7 @@ class Title {
 
        /**
         * Get the expiry time for the restriction against a given action
-        * @return 14-char timestamp, or 'infinity' if the page is protected forever 
+        * @return 14-char timestamp, or 'infinity' if the page is protected forever
         * or not protected at all, or false if the action is not recognised.
         */
        public function getRestrictionExpiry( $action ) {
@@ -1849,26 +2042,51 @@ class Title {
         * @return \type{\int} the number of archived revisions
         */
        public function isDeleted() {
-               $fname = 'Title::isDeleted';
-               if ( $this->getNamespace() < 0 ) {
+               if( $this->getNamespace() < 0 ) {
                        $n = 0;
                } else {
                        $dbr = wfGetDB( DB_SLAVE );
-                       $n = $dbr->selectField( 'archive', 'COUNT(*)', array( 'ar_namespace' => $this->getNamespace(),
-                               'ar_title' => $this->getDBkey() ), $fname );
+                       $n = $dbr->selectField( 'archive', 'COUNT(*)',
+                               array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ),
+                               __METHOD__
+                       );
                        if( $this->getNamespace() == NS_FILE ) {
                                $n += $dbr->selectField( 'filearchive', 'COUNT(*)',
-                                       array( 'fa_name' => $this->getDBkey() ), $fname );
+                                       array( 'fa_name' => $this->getDBkey() ),
+                                       __METHOD__
+                               );
                        }
                }
                return (int)$n;
        }
 
+       /**
+        * Is there a version of this page in the deletion archive?
+        * @return bool
+        */
+       public function isDeletedQuick() {
+               if( $this->getNamespace() < 0 ) {
+                       return false;
+               }
+               $dbr = wfGetDB( DB_SLAVE );
+               $deleted = (bool)$dbr->selectField( 'archive', '1',
+                       array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ),
+                       __METHOD__
+               );
+               if( !$deleted && $this->getNamespace() == NS_FILE ) {
+                       $deleted = (bool)$dbr->selectField( 'filearchive', '1',
+                               array( 'fa_name' => $this->getDBkey() ),
+                               __METHOD__
+                       );
+               }
+               return $deleted;
+       }
+
        /**
         * Get the article ID for this Title from the link cache,
         * adding it if necessary
         * @param $flags \type{\int} a bit field; may be GAID_FOR_UPDATE to select
-        *      for update
+        *  for update
         * @return \type{\int} the ID
         */
        public function getArticleID( $flags = 0 ) {
@@ -1930,7 +2148,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 )
@@ -1955,8 +2173,8 @@ class Title {
                $linkCache = LinkCache::singleton();
                $linkCache->clearBadLink( $this->getPrefixedDBkey() );
 
-               if ( 0 == $newid ) { $this->mArticleID = -1; }
-               else { $this->mArticleID = $newid; }
+               if ( $newid === false ) { $this->mArticleID = -1; }
+               else { $this->mArticleID = intval( $newid ); }
                $this->mRestrictionsLoaded = false;
                $this->mRestrictions = array();
        }
@@ -1971,8 +2189,8 @@ class Title {
                }
                $dbw = wfGetDB( DB_MASTER );
                $success = $dbw->update( 'page',
-                       array( 'page_touched' => $dbw->timestamp() ), 
-                       $this->pageCond(), 
+                       array( 'page_touched' => $dbw->timestamp() ),
+                       $this->pageCond(),
                        __METHOD__
                );
                HTMLFileCache::clearFileCache( $this );
@@ -1989,7 +2207,7 @@ class Title {
         */
        /* private */ function prefix( $name ) {
                $p = '';
-               if ( '' != $this->mInterwiki ) {
+               if ( $this->mInterwiki != '' ) {
                        $p = $this->mInterwiki . ':';
                }
                if ( 0 != $this->mNamespace ) {
@@ -1998,20 +2216,10 @@ 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.
@@ -2028,6 +2236,37 @@ class Title {
                                '/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
 
@@ -2039,11 +2278,14 @@ 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 ) {
+               if ( $dbkey == '' ) {
                        return false;
                }
 
@@ -2064,14 +2306,22 @@ class Title {
 
                # Namespace or interwiki prefix
                $firstPass = true;
+               $prefixRegexp = "/^(.+?)_*:_*(.*)$/S";
                do {
                        $m = array();
-                       if ( preg_match( "/^(.+?)_*:_*(.*)$/S", $dbkey, $m ) ) {
+                       if ( preg_match( $prefixRegexp, $dbkey, $m ) ) {
                                $p = $m[1];
-                               if ( $ns = $wgContLang->getNsIndex( $p )) {
+                               if ( $ns = $wgContLang->getNsIndex( $p ) ) {
                                        # Ordinary namespace
                                        $dbkey = $m[2];
                                        $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] ) )
+                                                       return false; # Disallow Talk:File:x type titles...
+                                               else if( Interwiki::isValidInterwiki( $x[1] ) )
+                                                       return false; # Disallow Talk:Interwiki:x type titles...
+                                       }
                                } elseif( Interwiki::isValidInterwiki( $p ) ) {
                                        if( !$firstPass ) {
                                                # Can't make a local interwiki link to an interwiki link.
@@ -2110,7 +2360,7 @@ class Title {
 
                # We already know that some pages won't be in the database!
                #
-               if ( '' != $this->mInterwiki || NS_SPECIAL == $this->mNamespace ) {
+               if ( $this->mInterwiki != '' || NS_SPECIAL == $this->mNamespace ) {
                        $this->mArticleID = 0;
                }
                $fragment = strstr( $dbkey, '#' );
@@ -2174,8 +2424,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 );
                }
 
                /**
@@ -2212,7 +2462,7 @@ class Title {
 
        /**
         * Set the fragment for this title. Removes the first character from the
-        * specified fragment before setting, so it assumes you're passing it with 
+        * specified fragment before setting, so it assumes you're passing it with
         * an initial "#".
         *
         * Deprecated for public use, use Title::makeTitle() with fragment parameter.
@@ -2254,13 +2504,13 @@ class Title {
         * WARNING: do not use this function on arbitrary user-supplied titles!
         * On heavily-used templates it will max out the memory.
         *
-        * @param $options \type{\string} may be FOR UPDATE
+        * @param array $options may be FOR UPDATE
         * @return \type{\arrayof{Title}} the Title objects linking here
         */
-       public function getLinksTo( $options = '', $table = 'pagelinks', $prefix = 'pl' ) {
+       public function getLinksTo( $options = array(), $table = 'pagelinks', $prefix = 'pl' ) {
                $linkCache = LinkCache::singleton();
 
-               if ( $options ) {
+               if ( count( $options ) > 0 ) {
                        $db = wfGetDB( DB_MASTER );
                } else {
                        $db = wfGetDB( DB_SLAVE );
@@ -2295,10 +2545,10 @@ class Title {
         * WARNING: do not use this function on arbitrary user-supplied titles!
         * On heavily-used templates it will max out the memory.
         *
-        * @param $options \type{\string} may be FOR UPDATE
+        * @param array $options may be FOR UPDATE
         * @return \type{\arrayof{Title}} the Title objects linking here
         */
-       public function getTemplateLinksTo( $options = '' ) {
+       public function getTemplateLinksTo( $options = array() ) {
                return $this->getLinksTo( $options, 'templatelinks', 'tl' );
        }
 
@@ -2306,42 +2556,35 @@ class Title {
         * Get an array of Title objects referring to non-existent articles linked from this page
         *
         * @todo check if needed (used only in SpecialBrokenRedirects.php, and should use redirect table in this case)
-        * @param $options \type{\string} may be FOR UPDATE
         * @return \type{\arrayof{Title}} the Title objects
         */
-       public function getBrokenLinksFrom( $options = '' ) {
+       public function getBrokenLinksFrom() {
                if ( $this->getArticleId() == 0 ) {
                        # All links from article ID 0 are false positives
                        return array();
                }
 
-               if ( $options ) {
-                       $db = wfGetDB( DB_MASTER );
-               } else {
-                       $db = wfGetDB( DB_SLAVE );
-               }
-
-               $res = $db->safeQuery(
-                         "SELECT pl_namespace, pl_title
-                            FROM !
-                       LEFT JOIN !
-                              ON pl_namespace=page_namespace
-                             AND pl_title=page_title
-                           WHERE pl_from=?
-                             AND page_namespace IS NULL
-                                 !",
-                       $db->tableName( 'pagelinks' ),
-                       $db->tableName( 'page' ),
-                       $this->getArticleId(),
-                       $options );
+               $dbr = wfGetDB( DB_SLAVE );
+               $res = $dbr->select(
+                       array( 'page', 'pagelinks' ),
+                       array( 'pl_namespace', 'pl_title' ),
+                       array(
+                               'pl_from' => $this->getArticleId(),
+                               'page_namespace IS NULL'
+                       ),
+                       __METHOD__, array(),
+                       array(
+                               'page' => array(
+                                       'LEFT JOIN',
+                                       array( 'pl_namespace=page_namespace', 'pl_title=page_title' )
+                               )
+                       )
+               );
 
                $retVal = array();
-               if ( $db->numRows( $res ) ) {
-                       foreach( $res as $row ) {
-                               $retVal[] = Title::makeTitle( $row->pl_namespace, $row->pl_title );
-                       }
+               foreach( $res as $row ) {
+                       $retVal[] = Title::makeTitle( $row->pl_namespace, $row->pl_title );
                }
-               $db->freeResult( $res );
                return $retVal;
        }
 
@@ -2397,14 +2640,14 @@ class Title {
         * Returns true if ok, or a getUserPermissionsErrors()-like array otherwise
         * @param &$nt \type{Title} the new title
         * @param $auth \type{\bool} indicates whether $wgUser's permissions
-        *      should be checked
+        *  should be checked
         * @param $reason \type{\string} is the log summary of the move, used for spam checking
         * @return \type{\mixed} True on success, getUserPermissionsErrors()-like array on failure
         */
        public function isValidMoveOperation( &$nt, $auth = true, $reason = '' ) {
                global $wgUser;
 
-               $errors = array();      
+               $errors = array();
                if( !$nt ) {
                        // Normally we'd add this to $errors, but we'll get
                        // lots of syntax errors if $nt is not an object
@@ -2429,9 +2672,9 @@ class Title {
                if ( strlen( $nt->getDBkey() ) < 1 ) {
                        $errors[] = array('articleexists');
                }
-               if ( ( '' == $this->getDBkey() ) ||
+               if ( ( $this->getDBkey() == '' ) ||
                         ( !$oldid ) ||
-                    ( '' == $nt->getDBkey() ) ) {
+                    ( $nt->getDBkey() == '' ) ) {
                        $errors[] = array('badarticleerror');
                }
 
@@ -2445,10 +2688,15 @@ class Title {
                                if( $nt->getText() != wfStripIllegalFilenameChars( $nt->getText() ) ) {
                                        $errors[] = array('imageinvalidfilename');
                                }
-                               if( !File::checkExtensionCompatibility( $file, $nt->getDBKey() ) ) {
+                               if( !File::checkExtensionCompatibility( $file, $nt->getDBkey() ) ) {
                                        $errors[] = array('imagetypemismatch');
                                }
                        }
+                       $destfile = wfLocalFile( $nt );
+                       if( !$wgUser->isAllowed( 'reupload-shared' ) && !$destfile->exists() && wfFindFile( $nt ) ) {
+                               $errors[] = array( 'file-exists-sharedrepo' );
+                       }
+
                }
 
                if ( $auth ) {
@@ -2459,12 +2707,12 @@ class Title {
                                $nt->getUserPermissionsErrors('edit', $wgUser) );
                }
 
-               $match = EditPage::matchSpamRegex( $reason );
+               $match = EditPage::matchSummarySpamRegex( $reason );
                if( $match !== false ) {
                        // This is kind of lame, won't display nice
                        $errors[] = array('spamprotectiontext');
                }
-               
+
                $err = null;
                if( !wfRunHooks( 'AbortMove', array( $this, $nt, $wgUser, &$err, $reason ) ) ) {
                        $errors[] = array('hookaborted', $err);
@@ -2494,7 +2742,7 @@ class Title {
         * Move a title to a new location
         * @param &$nt \type{Title} the new title
         * @param $auth \type{\bool} indicates whether $wgUser's permissions
-        *      should be checked
+        *  should be checked
         * @param $reason \type{\string} The reason for the move
         * @param $createRedirect \type{\bool} Whether to create a redirect from the old title to the new title.
         *  Ignored if the user doesn't have the suppressredirect right.
@@ -2506,6 +2754,18 @@ class Title {
                        return $err;
                }
 
+               // If it is a file, move it first. It is done before all other moving stuff is done because it's hard to revert
+               $dbw = wfGetDB( DB_MASTER );
+               if( $this->getNamespace() == NS_FILE ) {
+                       $file = wfLocalFile( $this );
+                       if( $file->exists() ) {
+                               $status = $file->move( $nt );
+                               if( !$status->isOk() ) {
+                                       return $status->getErrorsArray();
+                               }
+                       }
+               }
+
                $pageid = $this->getArticleID();
                $protected = $this->isProtected();
                if( $nt->exists() ) {
@@ -2532,7 +2792,6 @@ class Title {
                // we can't actually distinguish it from a default here, and it'll
                // be set to the new title even though it really shouldn't.
                // It'll get corrected on the next edit, but resetting cl_timestamp.
-               $dbw = wfGetDB( DB_MASTER );
                $dbw->update( 'categorylinks',
                        array(
                                'cl_sortkey' => $nt->getPrefixedText(),
@@ -2545,7 +2804,7 @@ class Title {
                if( $protected ) {
                        # Protect the redirect title as the title used to be...
                        $dbw->insertSelect( 'page_restrictions', 'page_restrictions',
-                               array( 
+                               array(
                                        'pr_page'    => $redirid,
                                        'pr_type'    => 'pr_type',
                                        'pr_level'   => 'pr_level',
@@ -2559,8 +2818,8 @@ class Title {
                        );
                        # Update the protection log
                        $log = new LogPage( 'protect' );
-                       $comment = wfMsgForContent('prot_1movedto2',$this->getPrefixedText(), $nt->getPrefixedText() );
-                       if( $reason ) $comment .= ': ' . $reason;
+                       $comment = wfMsgForContent( 'prot_1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
+                       if( $reason ) $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                        $log->addEntry( 'move_prot', $nt, $comment, array($this->getPrefixedText()) ); // FIXME: $params?
                }
 
@@ -2601,8 +2860,16 @@ class Title {
                # Update message cache for interface messages
                if( $nt->getNamespace() == NS_MEDIAWIKI ) {
                        global $wgMessageCache;
-                       $oldarticle = new Article( $this );
-                       $wgMessageCache->replace( $this->getDBkey(), $oldarticle->getContent() );
+
+                       # @bug 17860: old article can be deleted, if this the case,
+                       # delete it from message cache
+                       if ( $this->getArticleID() === 0 ) {
+                               $wgMessageCache->replace( $this->getDBkey(), false );
+                       } else {
+                               $oldarticle = new Article( $this );
+                               $wgMessageCache->replace( $this->getDBkey(), $oldarticle->getContent() );
+                       }
+
                        $newarticle = new Article( $nt );
                        $wgMessageCache->replace( $nt->getDBkey(), $newarticle->getContent() );
                }
@@ -2617,19 +2884,21 @@ class Title {
         * source page
         *
         * @param &$nt \type{Title} the page to move to, which should currently
-        *      be a redirect
+        *  be a redirect
         * @param $reason \type{\string} The reason for the move
         * @param $createRedirect \type{\bool} Whether to leave a redirect at the old title.
         *  Ignored if the user doesn't have the suppressredirect right
         */
        private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) {
-               global $wgUseSquid, $wgUser;
-               $fname = 'Title::moveOverExistingRedirect';
+               global $wgUseSquid, $wgUser, $wgContLang;
+
                $comment = wfMsgForContent( '1movedto2_redir', $this->getPrefixedText(), $nt->getPrefixedText() );
 
                if ( $reason ) {
-                       $comment .= ": $reason";
+                       $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                }
+               # Truncate for whole multibyte characters. +5 bytes for ellipsis
+               $comment = $wgContLang->truncate( $comment, 250 );
 
                $now = wfTimestampNow();
                $newid = $nt->getArticleID();
@@ -2638,11 +2907,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;
@@ -2656,11 +2929,16 @@ 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 );
                $nullRevId = $nullRevision->insertOn( $dbw );
-               
+
                $article = new Article( $this );
                wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 
@@ -2673,7 +2951,7 @@ class Title {
                                'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
-                       $fname
+                       __METHOD__
                );
                $nt->resetArticleID( $oldid );
 
@@ -2689,36 +2967,24 @@ class Title {
                                'text'    => $redirectText ) );
                        $redirectRevision->insertOn( $dbw );
                        $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
-                       
+
                        wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false, $wgUser) );
 
                        # 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 );
                        $redirectSuppressed = true;
                }
 
-               # Move an image if this is a file
-               if( $this->getNamespace() == NS_FILE ) {
-                       $file = wfLocalFile( $this );
-                       if( $file->exists() ) {
-                               $status = $file->move( $nt );
-                               if( !$status->isOk() ) {
-                                       $dbw->rollback();
-                                       return $status->getErrorsArray();
-                               }
-                       }
-               }
-
                # Log the move
                $log = new LogPage( 'move' );
                $log->addEntry( 'move_redir', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
@@ -2729,7 +2995,7 @@ class Title {
                        $u = new SquidUpdate( $urls );
                        $u->doUpdate();
                }
-               
+
        }
 
        /**
@@ -2740,26 +3006,31 @@ class Title {
         *  Ignored if the user doesn't have the suppressredirect right
         */
        private function moveToNewTitle( &$nt, $reason = '', $createRedirect = true ) {
-               global $wgUseSquid, $wgUser;
-               $fname = 'MovePageForm::moveToNewTitle';
+               global $wgUseSquid, $wgUser, $wgContLang;
+
                $comment = wfMsgForContent( '1movedto2', $this->getPrefixedText(), $nt->getPrefixedText() );
                if ( $reason ) {
                        $comment .= wfMsgExt( 'colon-separator',
                                array( 'escapenoentities', 'content' ) );
                        $comment .= $reason;
                }
+               # Truncate for whole multibyte characters. +5 bytes for ellipsis
+               $comment = $wgContLang->truncate( $comment, 250 );
 
                $newid = $nt->getArticleID();
                $oldid = $this->getArticleID();
                $latest = $this->getLatestRevId();
-               
+
                $dbw = wfGetDB( DB_MASTER );
                $now = $dbw->timestamp();
 
                # 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 );
                wfRunHooks( 'NewRevisionFromEditComplete', array($article, $nullRevision, $latest, $wgUser) );
 
@@ -2772,7 +3043,7 @@ class Title {
                                'page_latest'    => $nullRevId,
                        ),
                        /* WHERE */ array( 'page_id' => $oldid ),
-                       $fname
+                       __METHOD__
                );
                $nt->resetArticleID( $oldid );
 
@@ -2788,7 +3059,7 @@ class Title {
                                'text'    => $redirectText ) );
                        $redirectRevision->insertOn( $dbw );
                        $redirectArticle->updateRevisionOn( $dbw, $redirectRevision, 0 );
-                       
+
                        wfRunHooks( 'NewRevisionFromEditComplete', array($redirectArticle, $redirectRevision, false, $wgUser) );
 
                        # Record the just-created redirect's linking to the page
@@ -2797,25 +3068,13 @@ class Title {
                                        'pl_from'      => $newid,
                                        'pl_namespace' => $nt->getNamespace(),
                                        'pl_title'     => $nt->getDBkey() ),
-                               $fname );
+                               __METHOD__ );
                        $redirectSuppressed = false;
                } else {
                        $this->resetArticleID( 0 );
                        $redirectSuppressed = true;
                }
 
-               # Move an image if this is a file
-               if( $this->getNamespace() == NS_FILE ) {
-                       $file = wfLocalFile( $this );
-                       if( $file->exists() ) {
-                               $status = $file->move( $nt );
-                               if( !$status->isOk() ) {
-                                       $dbw->rollback();
-                                       return $status->getErrorsArray();
-                               }
-                       }
-               }
-
                # Log the move
                $log = new LogPage( 'move' );
                $log->addEntry( 'move', $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
@@ -2826,9 +3085,75 @@ class Title {
                # Purge old title from squid
                # The new title, and links to the new title, are purged in Article::onArticleCreate()
                $this->purgeSquid();
-               
+
+       }
+
+       /**
+        * Move this page's subpages to be subpages of $nt
+        * @param $nt Title Move target
+        * @param $auth bool Whether $wgUser's permissions should be checked
+        * @param $reason string The reason for the move
+        * @param $createRedirect bool Whether to create redirects from the old subpages to the new ones
+        *  Ignored if the user doesn't have the 'suppressredirect' right
+        * @return mixed array with old page titles as keys, and strings (new page titles) or
+        *  arrays (errors) as values, or an error array with numeric indices if no pages were moved
+        */
+       public function moveSubpages( $nt, $auth = true, $reason = '', $createRedirect = true ) {
+               global $wgMaximumMovedPages;
+               // Check permissions
+               if( !$this->userCan( 'move-subpages' ) )
+                       return array( 'cant-move-subpages' );
+               // Do the source and target namespaces support subpages?
+               if( !MWNamespace::hasSubpages( $this->getNamespace() ) )
+                       return array( 'namespace-nosubpages',
+                               MWNamespace::getCanonicalName( $this->getNamespace() ) );
+               if( !MWNamespace::hasSubpages( $nt->getNamespace() ) )
+                       return array( 'namespace-nosubpages',
+                               MWNamespace::getCanonicalName( $nt->getNamespace() ) );
+
+               $subpages = $this->getSubpages($wgMaximumMovedPages + 1);
+               $retval = array();
+               $count = 0;
+               foreach( $subpages as $oldSubpage ) {
+                       $count++;
+                       if( $count > $wgMaximumMovedPages ) {
+                               $retval[$oldSubpage->getPrefixedTitle()] =
+                                               array( 'movepage-max-pages',
+                                                       $wgMaximumMovedPages );
+                               break;
+                       }
+
+                       // 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(), '#' ).'#',
+                                       StringUtils::escapeRegexReplacement( $nt->getDBkey() ), # bug 21234
+                                       $oldSubpage->getDBkey() );
+                       if( $oldSubpage->isTalkPage() ) {
+                               $newNs = $nt->getTalkPage()->getNamespace();
+                       } else {
+                               $newNs = $nt->getSubjectPage()->getNamespace();
+                       }
+                       # Bug 14385: we need makeTitleSafe because the new page names may
+                       # be longer than 255 characters.
+                       $newSubpage = Title::makeTitleSafe( $newNs, $newPageName );
+
+                       $success = $oldSubpage->moveTo( $newSubpage, $auth, $reason, $createRedirect );
+                       if( $success === true ) {
+                               $retval[$oldSubpage->getPrefixedText()] = $newSubpage->getPrefixedText();
+                       } else {
+                               $retval[$oldSubpage->getPrefixedText()] = $success;
+                       }
+               }
+               return $retval;
        }
-       
+
        /**
         * Checks if this page is just a one-rev redirect.
         * Adds lock, so don't use just for light purposes.
@@ -2842,7 +3167,7 @@ class Title {
                        array( 'page_is_redirect', 'page_latest', 'page_id' ),
                        $this->pageCond(),
                        __METHOD__,
-                       'FOR UPDATE'
+                       array( 'FOR UPDATE' )
                );
                # Cache some fields we may want
                $this->mArticleID = $row ? intval($row->page_id) : 0;
@@ -2858,9 +3183,9 @@ class Title {
                                'page_title' => $this->getDBkey(),
                                'page_id=rev_page',
                                'page_latest != rev_id'
-                       ), 
+                       ),
                        __METHOD__,
-                       'FOR UPDATE'
+                       array( 'FOR UPDATE' )
                );
                # Return true if there was no history
                return ($row === false);
@@ -2958,7 +3283,7 @@ class Title {
         * @return \type{\array} Tree of parent categories
         */
        public function getParentCategoryTree( $children = array() ) {
-               $stack = array();
+               $stack = array();
                $parents = $this->getParentCategories();
 
                if( $parents ) {
@@ -3032,7 +3357,29 @@ class Title {
                        array( 'ORDER BY' => 'rev_id' )
                );
        }
-       
+
+       /**
+        * Get the first revision of the page
+        *
+        * @param $flags \type{\int} GAID_FOR_UPDATE
+        * @return Revision (or NULL if page doesn't exist)
+        */
+       public function getFirstRevision( $flags=0 ) {
+               $db = ($flags & GAID_FOR_UPDATE) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
+               $pageId = $this->getArticleId($flags);
+               if( !$pageId ) return null;
+               $row = $db->selectRow( 'revision', '*',
+                       array( 'rev_page' => $pageId ),
+                       __METHOD__,
+                       array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 1 )
+               );
+               if( !$row ) {
+                       return null;
+               } else {
+                       return new Revision( $row );
+               }
+       }
+
        /**
         * Check if this is a new page
         *
@@ -3070,12 +3417,12 @@ 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 ),
-                       __METHOD__,
-                       array( 'USE INDEX' => 'PRIMARY' ) );
+                       __METHOD__
+               );
        }
 
        /**
@@ -3094,7 +3441,7 @@ class Title {
        /**
         * Callback for usort() to do title sorts by (namespace, title)
         */
-       static function compare( $a, $b ) {
+       public static function compare( $a, $b ) {
                if( $a->getNamespace() == $b->getNamespace() ) {
                        return strcmp( $a->getText(), $b->getText() );
                } else {
@@ -3144,12 +3491,12 @@ class Title {
                if( $this->mInterwiki != '' ) {
                        return true;  // any interwiki link might be viewable, for all we know
                }
-               switch( $this->mNamespace ) {                   
+               switch( $this->mNamespace ) {
                case NS_MEDIA:
                case NS_FILE:
                        return wfFindFile( $this );  // file exists, possibly in a foreign repo
                case NS_SPECIAL:
-                       return SpecialPage::exists( $this->getDBKey() );  // valid special page
+                       return SpecialPage::exists( $this->getDBkey() );  // valid special page
                case NS_MAIN:
                        return $this->mDbkeyform == '';  // selflink, possibly with fragment
                case NS_MEDIAWIKI:
@@ -3176,7 +3523,7 @@ class Title {
        public function isKnown() {
                return $this->exists() || $this->isAlwaysKnown();
        }
-       
+
        /**
        * Is this in a namespace that allows actual pages?
        *
@@ -3206,7 +3553,7 @@ class Title {
         * @param Database $db, optional db
         * @return \type{\string} Last touched timestamp
         */
-       public function getTouched( $db = NULL ) {
+       public function getTouched( $db = null ) {
                $db = isset($db) ? $db : wfGetDB( DB_SLAVE );
                $touched = $db->selectField( 'page', 'page_touched', $this->pageCond(), __METHOD__ );
                return $touched;
@@ -3217,7 +3564,7 @@ class Title {
         * @param User $user
         * @return mixed string/NULL
         */
-       public function getNotificationTimestamp( $user = NULL ) {
+       public function getNotificationTimestamp( $user = null ) {
                global $wgUser, $wgShowUpdatedMarker;
                // Assume current user if none given
                if( !$user ) $user = $wgUser;
@@ -3250,9 +3597,9 @@ class Title {
         * @return \type{\string} Trackback URL
         */
        public function trackbackURL() {
-               global $wgScriptPath, $wgServer;
+               global $wgScriptPath, $wgServer, $wgScriptExtension;
 
-               return "$wgServer$wgScriptPath/trackback.php?article="
+               return "$wgServer$wgScriptPath/trackback$wgScriptExtension?article="
                        . htmlspecialchars(urlencode($this->getPrefixedDBkey()));
        }
 
@@ -3287,40 +3634,36 @@ 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;
+       }
+
+       /**
+        * Returns true if this is a special page.
+        */
+       public function isSpecialPage( ) {
+               return $this->getNamespace() == NS_SPECIAL;
        }
 
        /**
@@ -3368,21 +3711,21 @@ class Title {
        /**
         * Get all extant redirects to this Title
         *
-        * @param $ns \twotypes{\int,\null} Single namespace to consider; 
+        * @param $ns \twotypes{\int,\null} Single namespace to consider;
         *            NULL to consider all namespaces
         * @return \type{\arrayof{Title}} Redirects to this title
         */
        public function getRedirectsHere( $ns = null ) {
                $redirs = array();
-               
-               $dbr = wfGetDB( DB_SLAVE );     
+
+               $dbr = wfGetDB( DB_SLAVE );
                $where = array(
                        'rd_namespace' => $this->getNamespace(),
                        'rd_title' => $this->getDBkey(),
                        'rd_from = page_id'
                );
                if ( !is_null($ns) ) $where['page_namespace'] = $ns;
-               
+
                $res = $dbr->select(
                        array( 'redirect', 'page' ),
                        array( 'page_namespace', 'page_title' ),
@@ -3396,4 +3739,66 @@ class Title {
                }
                return $redirs;
        }
+
+       /**
+        * Check if this Title is a valid redirect target
+        *
+        * @return \type{\bool} TRUE or FALSE
+        */
+       public function isValidRedirectTarget() {
+               global $wgInvalidRedirectTargets;
+
+               // invalid redirect targets are stored in a global array, but explicity disallow Userlogout here
+               if( $this->isSpecial( 'Userlogout' ) ) {
+                       return false;
+               }
+
+               foreach( $wgInvalidRedirectTargets as $target ) {
+                       if( $this->isSpecial( $target ) ) {
+                               return false;
+                       }
+               }
+
+               return true;
+       }
+
+       /**
+        * Get a backlink cache object
+        */
+       function getBacklinkCache() {
+               if ( is_null( $this->mBacklinkCache ) ) {
+                       $this->mBacklinkCache = new BacklinkCache( $this );
+               }
+               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;
+       }
 }