Trim trailing whitespace
[lhc/web/wiklou.git] / includes / Title.php
index d21ed35..274bd25 100644 (file)
@@ -1,24 +1,25 @@
 <?php
 /**
  * See title.txt
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  */
 
-/**
- * @todo:  determine if it is really necessary to load this.  Appears to be left over from pre-autoloader versions, and
- *   is only really needed to provide access to constant UTF8_REPLACEMENT, which actually resides in UtfNormalDefines.php
- *   and is loaded by UtfNormalUtil.php, which is loaded by UtfNormal.php.
- */
-if ( !class_exists( 'UtfNormal' ) ) {
-       require_once( dirname( __FILE__ ) . '/normal/UtfNormal.php' );
-}
-
-/**
- * @deprecated This used to be a define, but was moved to
- * Title::GAID_FOR_UPDATE in 1.17. This will probably be removed in 1.18
- */
-define( 'GAID_FOR_UPDATE', Title::GAID_FOR_UPDATE );
-
 /**
  * Represents a title within MediaWiki.
  * Optionally may contain an interwiki designation or namespace.
@@ -87,9 +88,8 @@ class Title {
 
        /**
         * Constructor
-        * @private
         */
-       /* private */ function __construct() { }
+       /*protected*/ function __construct() { }
 
        /**
         * Create a new Title from a prefixed DB key
@@ -252,15 +252,35 @@ class Title {
         */
        public static function newFromRow( $row ) {
                $t = self::makeTitle( $row->page_namespace, $row->page_title );
-
-               $t->mArticleID = isset( $row->page_id ) ? intval( $row->page_id ) : -1;
-               $t->mLength = isset( $row->page_len ) ? intval( $row->page_len ) : -1;
-               $t->mRedirect = isset( $row->page_is_redirect ) ? (bool)$row->page_is_redirect : null;
-               $t->mLatestID = isset( $row->page_latest ) ? intval( $row->page_latest ) : false;
-
+               $t->loadFromRow( $row );
                return $t;
        }
 
+       /**
+        * Load Title object fields from a DB row.
+        * If false is given, the title will be treated as non-existing.
+        *
+        * @param $row Object|false database row
+        * @return void
+        */
+       public function loadFromRow( $row ) {
+               if ( $row ) { // page found
+                       if ( isset( $row->page_id ) )
+                               $this->mArticleID = (int)$row->page_id;
+                       if ( isset( $row->page_len ) )
+                               $this->mLength = (int)$row->page_len;
+                       if ( isset( $row->page_is_redirect ) )
+                               $this->mRedirect = (bool)$row->page_is_redirect;
+                       if ( isset( $row->page_latest ) )
+                               $this->mLatestID = (int)$row->page_latest;
+               } else { // page not found
+                       $this->mArticleID = 0;
+                       $this->mLength = 0;
+                       $this->mRedirect = false;
+                       $this->mLatestID = 0;
+               }
+       }
+
        /**
         * Create a new Title from a namespace index and a DB key.
         * It's assumed that $ns and $title are *valid*, for instance when
@@ -728,7 +748,8 @@ class Title {
         * @return String the prefixed title, with spaces
         */
        public function getPrefixedText() {
-               if ( empty( $this->mPrefixedText ) ) { // FIXME: bad usage of empty() ?
+               // @todo FIXME: Bad usage of empty() ?
+               if ( empty( $this->mPrefixedText ) ) {
                        $s = $this->prefix( $this->mTextform );
                        $s = str_replace( '_', ' ', $s );
                        $this->mPrefixedText = $s;
@@ -736,6 +757,20 @@ class Title {
                return $this->mPrefixedText;
        }
 
+       /**
+        * Return the prefixed title with spaces _without_ the interwiki prefix
+        * 
+        * @return \type{\string} the title, prefixed by the namespace but not by the interwiki prefix, with spaces
+        */
+       public function getSemiPrefixedText() {
+               if ( !isset( $this->mSemiPrefixedText ) ){
+                       $s = ( $this->mNamespace === NS_MAIN ? '' : $this->getNsText() . ':' ) . $this->mTextform;
+                       $s = str_replace( '_', ' ', $s );
+                       $this->mSemiPrefixedText = $s;
+               }
+               return $this->mSemiPrefixedText; 
+       }
+
        /**
         * Get the prefixed title with spaces, plus any fragment
         * (part beginning with '#')
@@ -751,7 +786,7 @@ class Title {
        }
 
        /**
-        * Get the base name, i.e. the leftmost parts before the /
+        * Get the base page name, i.e. the leftmost part before any slashes
         *
         * @return String Base name
         */
@@ -769,7 +804,7 @@ class Title {
        }
 
        /**
-        * Get the lowest-level subpage name, i.e. the rightmost part after /
+        * Get the lowest-level subpage name, i.e. the rightmost part after any slashes
         *
         * @return String Subpage name
         */
@@ -814,33 +849,13 @@ class Title {
         * @return String the URL
         */
        public function getFullURL( $query = '', $variant = false ) {
-               global $wgServer, $wgRequest;
-
-               if ( is_array( $query ) ) {
-                       $query = wfArrayToCGI( $query );
-               }
-
-               $interwiki = Interwiki::fetch( $this->mInterwiki );
-               if ( !$interwiki ) {
-                       $url = $this->getLocalURL( $query, $variant );
+               # Hand off all the decisions on urls to getLocalURL
+               $url = $this->getLocalURL( $query, $variant );
 
-                       // Ugly quick hack to avoid duplicate prefixes (bug 4571 etc)
-                       // Correct fix would be to move the prepending elsewhere.
-                       if ( $wgRequest->getVal( 'action' ) != 'render' ) {
-                               $url = $wgServer . $url;
-                       }
-               } else {
-                       $baseUrl = $interwiki->getURL();
-
-                       $namespace = wfUrlencode( $this->getNsText() );
-                       if ( $namespace != '' ) {
-                               # Can this actually happen? Interwikis shouldn't be parsed.
-                               # Yes! It can in interwiki transclusion. But... it probably shouldn't.
-                               $namespace .= ':';
-                       }
-                       $url = str_replace( '$1', $namespace . $this->mUrlform, $baseUrl );
-                       $url = wfAppendQuery( $url, $query );
-               }
+               # Expand the url to make it a full url. Note that getLocalURL has the
+               # potential to output full urls for a variety of reasons, so we use
+               # wfExpandUrl instead of simply prepending $wgServer
+               $url = wfExpandUrl( $url, PROTO_RELATIVE );
 
                # Finally, add the fragment.
                $url .= $this->getFragmentForURL();
@@ -868,15 +883,16 @@ class Title {
                        $query = wfArrayToCGI( $query );
                }
 
-               if ( $this->isExternal() ) {
-                       $url = $this->getFullURL();
-                       if ( $query ) {
-                               // This is currently only used for edit section links in the
-                               // context of interwiki transclusion. In theory we should
-                               // append the query to the end of any existing query string,
-                               // but interwiki transclusion is already broken in that case.
-                               $url .= "?$query";
+               $interwiki = Interwiki::fetch( $this->mInterwiki );
+               if ( $interwiki ) {
+                       $namespace = $this->getNsText();
+                       if ( $namespace != '' ) {
+                               # Can this actually happen? Interwikis shouldn't be parsed.
+                               # Yes! It can in interwiki transclusion. But... it probably shouldn't.
+                               $namespace .= ':';
                        }
+                       $url = $interwiki->getURL( $namespace . $this->getDBkey() );
+                       $url = wfAppendQuery( $url, $query );
                } else {
                        $dbkey = wfUrlencode( $this->getPrefixedDBkey() );
                        if ( $query == '' ) {
@@ -890,6 +906,7 @@ class Title {
                                        $url = str_replace( '$1', $dbkey, $url  );
                                } else {
                                        $url = str_replace( '$1', $dbkey, $wgArticlePath );
+                                       wfRunHooks( 'GetLocalURL::Article', array( &$this, &$url ) );
                                }
                        } else {
                                global $wgActionPaths;
@@ -910,6 +927,7 @@ class Title {
                                                }
                                        }
                                }
+
                                if ( $url === false ) {
                                        if ( $query == '-' ) {
                                                $query = '';
@@ -918,13 +936,15 @@ class Title {
                                }
                        }
 
-                       // FIXME: this causes breakage in various places when we
+                       wfRunHooks( 'GetLocalURL::Internal', array( &$this, &$url, $query, $variant ) );
+
+                       // @todo FIXME: This causes breakage in various places when we
                        // actually expected a local URL and end up with dupe prefixes.
                        if ( $wgRequest->getVal( 'action' ) == 'render' ) {
                                $url = $wgServer . $url;
                        }
                }
-               wfRunHooks( 'GetLocalURL', array( &$this, &$url, $query ) );
+               wfRunHooks( 'GetLocalURL', array( &$this, &$url, $query, $variant ) );
                return $url;
        }
 
@@ -979,24 +999,57 @@ class Title {
        public function escapeFullURL( $query = '' ) {
                return htmlspecialchars( $this->getFullURL( $query ) );
        }
+       
+       /**
+        * HTML-escaped version of getCanonicalURL()
+        */
+       public function escapeCanonicalURL( $query = '', $variant = false ) {
+               return htmlspecialchars( $this->getCanonicalURL( $query, $variant ) );
+       }
 
        /**
         * Get the URL form for an internal link.
         * - Used in various Squid-related code, in case we have a different
         * internal hostname for the server from the exposed one.
+        * 
+        * This uses $wgInternalServer to qualify the path, or $wgServer
+        * if $wgInternalServer is not set. If the server variable used is
+        * protocol-relative, the URL will be expanded to http://
         *
         * @param $query String an optional query string
         * @param $variant String language variant of url (for sr, zh..)
         * @return String the URL
         */
        public function getInternalURL( $query = '', $variant = false ) {
-               global $wgInternalServer, $wgServer;
-               $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer;
-               $url = $server . $this->getLocalURL( $query, $variant );
+               if ( $this->isExternal( ) ) {
+                       $server = '';
+               } else {
+                       global $wgInternalServer, $wgServer;
+                       $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer;
+               }
+               $url = wfExpandUrl( $server . $this->getLocalURL( $query, $variant ), PROTO_HTTP );
                wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) );
                return $url;
        }
 
+       /**
+        * Get the URL for a canonical link, for use in things like IRC and
+        * e-mail notifications. Uses $wgCanonicalServer and the
+        * GetCanonicalURL hook.
+        * 
+        * NOTE: Unlike getInternalURL(), the canonical URL includes the fragment
+        * 
+        * @param $query string An optional query string
+        * @param $variant string Language variant of URL (for sr, zh, ...)
+        * @return string The URL
+        */
+       public function getCanonicalURL( $query = '', $variant = false ) {
+               global $wgCanonicalServer;
+               $url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL );
+               wfRunHooks( '', array( &$this, &$url, $query ) );
+               return $url;
+       }
+
        /**
         * Get the edit URL for this Title
         *
@@ -1145,17 +1198,12 @@ class Title {
         * Determines if $user is unable to edit this page because it has been protected
         * by $wgNamespaceProtection.
         *
-        * @param $user User object, $wgUser will be used if not passed
+        * @param $user User object to check permissions
         * @return Bool
         */
-       public function isNamespaceProtected( User $user = null ) {
+       public function isNamespaceProtected( User $user ) {
                global $wgNamespaceProtection;
 
-               if ( $user === null ) {
-                       global $wgUser;
-                       $user = $wgUser;
-               }
-
                if ( isset( $wgNamespaceProtection[$this->mNamespace] ) ) {
                        foreach ( (array)$wgNamespaceProtection[$this->mNamespace] as $right ) {
                                if ( $right != '' && !$user->isAllowed( $right ) ) {
@@ -1181,11 +1229,12 @@ class Title {
        /**
         * Can $user perform $action on this page?
         *
-        * FIXME: This *does not* check throttles (User::pingLimiter()).
+        * @todo FIXME: This *does not* check throttles (User::pingLimiter()).
         *
         * @param $action String action that permission needs to be checked for
         * @param $user User to check
-        * @param $doExpensiveQueries Bool Set this to false to avoid doing unnecessary queries.
+        * @param $doExpensiveQueries Bool Set this to false to avoid doing unnecessary queries by
+        *   skipping checks for cascading protections and user blocks.
         * @param $ignoreErrors Array of Strings Set this to a list of message keys whose corresponding errors may be ignored.
         * @return Array of arguments to wfMsg to explain permissions problems.
         */
@@ -1216,34 +1265,33 @@ class Title {
         * @return Array list of errors
         */
        private function checkQuickPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) {
+               $ns = $this->getNamespace();
+
                if ( $action == 'create' ) {
-                       if ( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk' ) ) ||
-                                ( !$this->isTalkPage() && !$user->isAllowed( 'createpage' ) ) ) {
+                       if ( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk', $ns ) ) ||
+                                ( !$this->isTalkPage() && !$user->isAllowed( 'createpage', $ns ) ) ) {
                                $errors[] = $user->isAnon() ? array( 'nocreatetext' ) : array( 'nocreate-loggedin' );
                        }
                } elseif ( $action == 'move' ) {
-                       if ( !$user->isAllowed( 'move-rootuserpages' )
-                                       && $this->mNamespace == NS_USER && !$this->isSubpage() ) {
+                       if ( !$user->isAllowed( 'move-rootuserpages', $ns )
+                                       && $ns == 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->mNamespace == NS_FILE && !$user->isAllowed( 'movefile' ) ) {
+                       if ( $ns == NS_FILE && !$user->isAllowed( 'movefile', $ns ) ) {
                                $errors[] = array( 'movenotallowedfile' );
                        }
 
-                       if ( !$user->isAllowed( 'move' ) ) {
+                       if ( !$user->isAllowed( 'move', $ns) ) {
                                // 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'];
-                               }
+
+                               $userCanMove = in_array( 'move', User::getGroupPermissions(
+                                       array( 'user' ), $ns ), true );
+                               $autoconfirmedCanMove = in_array( 'move', User::getGroupPermissions(
+                                       array( 'autoconfirmed' ), $ns ), true );
+
                                if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) {
                                        // custom message if logged-in users without any special rights can move
                                        $errors[] = array( 'movenologintext' );
@@ -1252,20 +1300,20 @@ class Title {
                                }
                        }
                } elseif ( $action == 'move-target' ) {
-                       if ( !$user->isAllowed( 'move' ) ) {
+                       if ( !$user->isAllowed( 'move', $ns ) ) {
                                // User can't move anything
                                $errors[] = array( 'movenotallowed' );
-                       } elseif ( !$user->isAllowed( 'move-rootuserpages' )
-                                       && $this->mNamespace == NS_USER && !$this->isSubpage() ) {
+                       } elseif ( !$user->isAllowed( 'move-rootuserpages', $ns )
+                                       && $ns == 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 ) ) {
+               } elseif ( !$user->isAllowed( $action, $ns ) ) {
                        // We avoid expensive display logic for quickUserCan's and such
                        $groups = false;
                        if ( !$short ) {
                                $groups = array_map( array( 'User', 'makeGroupLinkWiki' ),
-                                       User::getGroupsWithPermission( $action ) );
+                                       User::getGroupsWithPermission( $action, $ns ) );
                        }
 
                        if ( $groups ) {
@@ -1296,13 +1344,13 @@ class Title {
                if ( is_array( $result ) && count( $result ) && !is_array( $result[0] ) ) {
                        // A single array representing an error
                        $errors[] = $result;
-               } else if ( is_array( $result ) && is_array( $result[0] ) ) {
+               } elseif ( is_array( $result ) && is_array( $result[0] ) ) {
                        // A nested array representing multiple errors
                        $errors = array_merge( $errors, $result );
-               } else if ( $result !== '' && is_string( $result ) ) {
+               } elseif ( $result !== '' && is_string( $result ) ) {
                        // A string representing a message-id
                        $errors[] = array( $result );
-               } else if ( $result === false ) {
+               } elseif ( $result === false ) {
                        // a generic "We don't want them to do that"
                        $errors[] = array( 'badaccess-group0' );
                }
@@ -1383,15 +1431,13 @@ class Title {
        private function checkCSSandJSPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                # 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->userCanEditCssSubpage()
-               #      and $this->userCanEditJsSubpage() from working
                # XXX: right 'editusercssjs' is deprecated, for backward compatibility only
                if ( $action != 'patrol' && !$user->isAllowed( 'editusercssjs' )
                                && !preg_match( '/^' . preg_quote( $user->getName(), '/' ) . '\//', $this->mTextform ) ) {
                        if ( $this->isCssSubpage() && !$user->isAllowed( 'editusercss' ) ) {
-                               $errors[] = array( 'customcssjsprotected' );
-                       } else if ( $this->isJsSubpage() && !$user->isAllowed( 'edituserjs' ) ) {
-                               $errors[] = array( 'customcssjsprotected' );
+                               $errors[] = array( 'customcssprotected' );
+                       } elseif ( $this->isJsSubpage() && !$user->isAllowed( 'edituserjs' ) ) {
+                               $errors[] = array( 'customjsprotected' );
                        }
                }
 
@@ -1417,9 +1463,9 @@ class Title {
                        if ( $right == 'sysop' ) {
                                $right = 'protect';
                        }
-                       if ( $right != '' && !$user->isAllowed( $right ) ) {
+                       if ( $right != '' && !$user->isAllowed( $right, $this->mNamespace ) ) {
                                // Users with 'editprotected' permission can edit protected pages
-                               if ( $action == 'edit' && $user->isAllowed( 'editprotected' ) ) {
+                               if ( $action == 'edit' && $user->isAllowed( 'editprotected', $this->mNamespace ) ) {
                                        // Users with 'editprotected' permission cannot edit protected pages
                                        // with cascading option turned on.
                                        if ( $this->mCascadeRestriction ) {
@@ -1460,7 +1506,7 @@ class Title {
                        if ( isset( $restrictions[$action] ) ) {
                                foreach ( $restrictions[$action] as $right ) {
                                        $right = ( $right == 'sysop' ) ? 'protect' : $right;
-                                       if ( $right != '' && !$user->isAllowed( $right ) ) {
+                                       if ( $right != '' && !$user->isAllowed( $right, $this->mNamespace ) ) {
                                                $pages = '';
                                                foreach ( $cascadingSources as $page )
                                                        $pages .= '* [[:' . $page->getPrefixedText() . "]]\n";
@@ -1496,7 +1542,9 @@ class Title {
                                if( $title_protection['pt_create_perm'] == 'sysop' ) {
                                        $title_protection['pt_create_perm'] = 'protect'; // B/C
                                }
-                               if( $title_protection['pt_create_perm'] == '' || !$user->isAllowed( $title_protection['pt_create_perm'] ) ) {
+                               if( $title_protection['pt_create_perm'] == '' ||
+                                               !$user->isAllowed( $title_protection['pt_create_perm'],
+                                               $this->mNamespace ) ) {
                                        $errors[] = array( 'titleprotected', User::whoIs( $title_protection['pt_user'] ), $title_protection['pt_reason'] );
                                }
                        }
@@ -1507,7 +1555,7 @@ class Title {
                                $errors[] = array( 'immobile-source-namespace', $this->getNsText() );
                        } elseif ( !$this->isMovable() ) {
                                // Less specific message for rarer cases
-                               $errors[] = array( 'immobile-page' );
+                               $errors[] = array( 'immobile-source-page' );
                        }
                } elseif ( $action == 'move-target' ) {
                        if ( !MWNamespace::isMovable( $this->mNamespace ) ) {
@@ -1531,7 +1579,7 @@ class Title {
         * @return Array list of errors
         */
        private function checkUserBlock( $action, $user, $errors, $doExpensiveQueries, $short ) {
-               if( $short && count( $errors ) > 0 ) {
+               if( !$doExpensiveQueries ) {
                        return $errors;
                }
 
@@ -1541,8 +1589,14 @@ class Title {
                        $errors[] = array( 'confirmedittext' );
                }
 
-               // Edit blocks should not affect reading. Account creation blocks handled at userlogin.
-               if ( $action != 'read' && $action != 'createaccount' && $user->isBlockedFrom( $this ) ) {
+               if ( in_array( $action, array( 'read', 'createaccount', 'unblock' ) ) ){
+                       // Edit blocks should not affect reading.
+                       // Account creation blocks handled at userlogin.
+                       // Unblocking handled in SpecialUnblock
+               } elseif( ( $action == 'edit' || $action == 'create' ) && !$user->isBlockedFrom( $this ) ){
+                       // Don't block the user from editing their own talk page unless they've been
+                       // explicitly blocked from that too.
+               } elseif( $user->isBlocked() && $user->mBlock->prevents( $action ) !== false ) {
                        $block = $user->mBlock;
 
                        // This is from OutputPage::blockedPage
@@ -1553,7 +1607,7 @@ class Title {
                        if ( $reason == '' ) {
                                $reason = wfMsg( 'blockednoreason' );
                        }
-                       $ip = wfGetIP();
+                       $ip = $user->getRequest()->getIP();
 
                        if ( is_numeric( $id ) ) {
                                $name = User::whoIs( $id );
@@ -1566,12 +1620,12 @@ class Title {
                        $blockExpiry = $user->mBlock->mExpiry;
                        $blockTimestamp = $wgLang->timeanddate( wfTimestamp( TS_MW, $user->mBlock->mTimestamp ), true );
                        if ( $blockExpiry == 'infinity' ) {
-                               $blockExpiry = wfMessage( 'infiniteblock' );
+                               $blockExpiry = wfMessage( 'infiniteblock' )->text();
                        } else {
                                $blockExpiry = $wgLang->timeanddate( wfTimestamp( TS_MW, $blockExpiry ), true );
                        }
 
-                       $intended = $user->mBlock->getTarget();
+                       $intended = strval( $user->mBlock->getTarget() );
 
                        $errors[] = array( ( $block->mAuto ? 'autoblockedtext' : 'blockedtext' ), $link, $reason, $ip, $name,
                                $blockid, $blockExpiry, $intended, $blockTimestamp );
@@ -1732,7 +1786,14 @@ class Title {
         * @return Bool TRUE or FALSE
         */
        public function isMovable() {
-               return MWNamespace::isMovable( $this->getNamespace() ) && $this->getInterwiki() == '';
+               if ( !MWNamespace::isMovable( $this->getNamespace() ) || $this->getInterwiki() != '' ) {
+                       // Interwiki title or immovable namespace. Hooks don't get to override here
+                       return false;
+               }
+               
+               $result = true;
+               wfRunHooks( 'TitleIsMovable', array( $this, &$result ) );
+               return $result;
        }
 
        /**
@@ -1754,7 +1815,7 @@ class Title {
                                # 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
@@ -1788,7 +1849,7 @@ class Title {
 
                        # Always grant access to the login page.
                        # Even anons need to be able to log in.
-                       if ( $this->isSpecial( 'Userlogin' ) || $this->isSpecial( 'Resetpass' ) ) {
+                       if ( $this->isSpecial( 'Userlogin' ) || $this->isSpecial( 'ChangePassword' ) ) {
                                return true;
                        }
 
@@ -1815,7 +1876,7 @@ class Title {
                        # If it's a special page, ditch the subpage bit and check again
                        if ( $this->getNamespace() == NS_SPECIAL ) {
                                $name = $this->getDBkey();
-                               list( $name, /* $subpage */ ) = SpecialPage::resolveAliasWithSubpage( $name );
+                               list( $name, /* $subpage */ ) = SpecialPageFactory::resolveAlias( $name );
                                if ( $name === false ) {
                                        # Invalid special page, but we show standard login required message
                                        return false;
@@ -1919,6 +1980,17 @@ class Title {
                );
        }
 
+       /**
+        * Does that page contain wikitext, or it is JS, CSS or whatever?
+        *
+        * @return Bool
+        */
+       public function isWikitextPage() {
+               $retval = !$this->isCssOrJsPage() && !$this->isCssJsSubpage();
+               wfRunHooks( 'TitleIsWikitextPage', array( $this, &$retval ) );
+               return $retval;
+       }
+
        /**
         * Could this page contain custom CSS or JavaScript, based
         * on the title?
@@ -1926,8 +1998,10 @@ class Title {
         * @return Bool
         */
        public function isCssOrJsPage() {
-               return $this->mNamespace == NS_MEDIAWIKI
+               $retval = $this->mNamespace == NS_MEDIAWIKI
                        && preg_match( '!\.(?:css|js)$!u', $this->mTextform ) > 0;
+               wfRunHooks( 'TitleIsCssOrJsPage', array( $this, &$retval ) );
+               return $retval;
        }
 
        /**
@@ -1981,11 +2055,12 @@ class Title {
         * Protect css subpages of user pages: can $wgUser edit
         * this page?
         *
+        * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead.
         * @return Bool
-        * @todo XXX: this might be better using restrictions
         */
        public function userCanEditCssSubpage() {
                global $wgUser;
+               wfDeprecated( __METHOD__ );
                return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'editusercss' ) )
                        || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
        }
@@ -1994,11 +2069,12 @@ class Title {
         * Protect js subpages of user pages: can $wgUser edit
         * this page?
         *
+        * @deprecated in 1.19; will be removed in 1.20. Use getUserPermissionsErrors() instead.
         * @return Bool
-        * @todo XXX: this might be better using restrictions
         */
        public function userCanEditJsSubpage() {
                global $wgUser;
+               wfDeprecated( __METHOD__ );
                return ( ( $wgUser->isAllowedAll( 'editusercssjs', 'edituserjs' ) )
                           || preg_match( '/^' . preg_quote( $wgUser->getName(), '/' ) . '\//', $this->mTextform ) );
        }
@@ -2029,7 +2105,7 @@ class Title {
 
                if ( isset( $this->mCascadeSources ) && $getPages ) {
                        return array( $this->mCascadeSources, $this->mCascadingRestrictions );
-               } else if ( isset( $this->mHasCascadingRestrictions ) && !$getPages ) {
+               } elseif ( isset( $this->mHasCascadingRestrictions ) && !$getPages ) {
                        return array( $this->mHasCascadingRestrictions, $pagerestrictions );
                }
 
@@ -2315,20 +2391,37 @@ class Title {
        /**
         * Is there a version of this page in the deletion archive?
         *
+        * @param $includeSuppressed Boolean Include suppressed revisions?
         * @return Int the number of archived revisions
         */
-       public function isDeleted() {
+       public function isDeleted( $includeSuppressed = false ) {
                if ( $this->getNamespace() < 0 ) {
                        $n = 0;
                } else {
                        $dbr = wfGetDB( DB_SLAVE );
+                       $conditions = array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() );
+
+                       if( !$includeSuppressed ) {
+                               $suppressedTextBits = Revision::DELETED_TEXT | Revision::DELETED_RESTRICTED;
+                               $conditions[] = $dbr->bitAnd('ar_deleted', $suppressedTextBits ) .
+                               ' != ' . $suppressedTextBits;
+                       }
+
                        $n = $dbr->selectField( 'archive', 'COUNT(*)',
-                               array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ),
+                               $conditions,
                                __METHOD__
                        );
                        if ( $this->getNamespace() == NS_FILE ) {
-                               $n += $dbr->selectField( 'filearchive', 'COUNT(*)',
-                                       array( 'fa_name' => $this->getDBkey() ),
+                               $fconditions = array( 'fa_name' => $this->getDBkey() );
+                               if( !$includeSuppressed ) {
+                                       $suppressedTextBits = File::DELETED_FILE | File::DELETED_RESTRICTED;
+                                       $fconditions[] = $dbr->bitAnd('fa_deleted', $suppressedTextBits ) .
+                                       ' != ' . $suppressedTextBits;
+                               }
+
+                               $n += $dbr->selectField( 'filearchive',
+                                       'COUNT(*)',
+                                       $fconditions,
                                        __METHOD__
                                );
                        }
@@ -2459,7 +2552,7 @@ class Title {
         */
        public function resetArticleID( $newid ) {
                $linkCache = LinkCache::singleton();
-               $linkCache->clearBadLink( $this->getPrefixedDBkey() );
+               $linkCache->clearLink( $this );
 
                if ( $newid === false ) {
                        $this->mArticleID = -1;
@@ -2501,7 +2594,7 @@ class Title {
         * @return String the prefixed text
         * @private
         */
-       /* private */ function prefix( $name ) {
+       private function prefix( $name ) {
                $p = '';
                if ( $this->mInterwiki != '' ) {
                        $p = $this->mInterwiki . ':';
@@ -2572,8 +2665,6 @@ class Title {
                global $wgContLang, $wgLocalInterwiki;
 
                # Initialisation
-               $rxTc = self::getTitleInvalidRegex();
-
                $this->mInterwiki = $this->mFragment = '';
                $this->mNamespace = $this->mDefaultNamespace; # Usually NS_MAIN
 
@@ -2604,7 +2695,7 @@ class Title {
 
                # Initial colon indicates main namespace rather than specified default
                # but should not create invalid {ns,title} pairs such as {0,Project:Foo}
-               if ( ':' == $dbkey { 0 } ) {
+               if ( ':' == $dbkey[0] ) {
                        $this->mNamespace = NS_MAIN;
                        $dbkey = substr( $dbkey, 1 ); # remove the colon but continue processing
                        $dbkey = trim( $dbkey, '_' ); # remove any subsequent whitespace
@@ -2626,7 +2717,7 @@ class Title {
                                                if ( $wgContLang->getNsIndex( $x[1] ) ) {
                                                        # Disallow Talk:File:x type titles...
                                                        return false;
-                                               } else if ( Interwiki::isValidInterwiki( $x[1] ) ) {
+                                               } elseif ( Interwiki::isValidInterwiki( $x[1] ) ) {
                                                        # Disallow Talk:Interwiki:x type titles...
                                                        return false;
                                                }
@@ -2675,7 +2766,7 @@ class Title {
                }
                $fragment = strstr( $dbkey, '#' );
                if ( false !== $fragment ) {
-                       $this->setFragment( preg_replace( '/^#_*/', '#', $fragment ) );
+                       $this->setFragment( $fragment );
                        $dbkey = substr( $dbkey, 0, strlen( $dbkey ) - strlen( $fragment ) );
                        # remove whitespace again: prevents "Foo_bar_#"
                        # becoming "Foo_bar_"
@@ -2683,6 +2774,7 @@ class Title {
                }
 
                # Reject illegal characters.
+               $rxTc = self::getTitleInvalidRegex();
                if ( preg_match( $rxTc, $dbkey ) ) {
                        return false;
                }
@@ -2769,6 +2861,10 @@ class Title {
                $this->mFragment = str_replace( '_', ' ', substr( $fragment, 1 ) );
        }
 
+       public function setInterwiki( $interwiki ) {
+               $this->mInterwiki = $interwiki;
+       }
+
        /**
         * Get a Title object associated with the talk page of this article
         *
@@ -3073,6 +3169,8 @@ class Title {
         * @return Mixed true on success, getUserPermissionsErrors()-like array on failure
         */
        public function moveTo( &$nt, $auth = true, $reason = '', $createRedirect = true ) {
+               global $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase;
+
                $err = $this->isValidMoveOperation( $nt, $auth, $reason );
                if ( is_array( $err ) ) {
                        return $err;
@@ -3092,14 +3190,14 @@ class Title {
                }
 
                $dbw->begin(); # If $file was a LocalFile, its transaction would have closed our own.
-               $pageid = $this->getArticleID( GAID_FOR_UPDATE );
+               $pageid = $this->getArticleID( self::GAID_FOR_UPDATE );
                $protected = $this->isProtected();
                $pageCountChange = ( $createRedirect ? 1 : 0 ) - ( $nt->exists() ? 1 : 0 );
 
                // Do the actual move
-               $err = $this->moveToInternal( $nt, $reason, $createRedirect );
+               $err = $this->moveOverExistingRedirect( $nt, $reason, $createRedirect );
                if ( is_array( $err ) ) {
-                       # FIXME: What about the File we have already moved?
+                       # @todo FIXME: What about the File we have already moved?
                        $dbw->rollback();
                        return $err;
                }
@@ -3129,6 +3227,15 @@ class Title {
                        );
                }
 
+               if ( $wgEnableInterwikiTemplatesTracking && $wgGlobalDatabase ) {
+                       $dbw2 = wfGetDB( DB_MASTER, array(), $wgGlobalDatabase );
+                       $dbw2->update( 'globaltemplatelinks',
+                                               array(  'gtl_from_namespace' => $nt->getNamespace(),
+                                                               'gtl_from_title' => $nt->getText() ),
+                                               array ( 'gtl_from_page' => $pageid ),
+                                               __METHOD__ );
+               }
+
                if ( $protected ) {
                        # Protect the redirect title as the title used to be...
                        $dbw->insertSelect( 'page_restrictions', 'page_restrictions',
@@ -3150,7 +3257,8 @@ class Title {
                        if ( $reason ) {
                                $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                        }
-                       $log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) ); // FIXME: $params?
+                       // @todo FIXME: $params?
+                       $log->addEntry( 'move_prot', $nt, $comment, array( $this->getPrefixedText() ) );
                }
 
                # Update watchlists
@@ -3170,7 +3278,7 @@ class Title {
                $u->doUpdate();
 
                $dbw->commit();
-               
+
                # Update site_stats
                if ( $this->isContentPage() && !$nt->isContentPage() ) {
                        # No longer a content page
@@ -3190,6 +3298,7 @@ class Title {
                if ( $u ) {
                        $u->doUpdate();
                }
+
                # Update message cache for interface messages
                if ( $this->getNamespace() == NS_MEDIAWIKI ) {
                        # @bug 17860: old article can be deleted, if this the case,
@@ -3220,8 +3329,8 @@ class Title {
         * @param $createRedirect Bool Whether to leave a redirect at the old title.  Ignored
         *   if the user doesn't have the suppressredirect right
         */
-       private function moveToInternal( &$nt, $reason = '', $createRedirect = true ) {
-               global $wgUser, $wgContLang;
+       private function moveOverExistingRedirect( &$nt, $reason = '', $createRedirect = true ) {
+               global $wgUser, $wgContLang, $wgEnableInterwikiTemplatesTracking, $wgGlobalDatabase;
 
                $moveOverRedirect = $nt->exists();
 
@@ -3231,15 +3340,12 @@ class Title {
                if ( $reason ) {
                        $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                }
-               # Truncate for whole multibyte characters. +5 bytes for ellipsis
-               $comment = $wgContLang->truncate( $comment, 250 );
+               # Truncate for whole multibyte characters.
+               $comment = $wgContLang->truncate( $comment, 255 );
 
                $oldid = $this->getArticleID();
                $latest = $this->getLatestRevID();
 
-               $oldns = $this->getNamespace();
-               $olddbk = $this->getDBkey();
-
                $dbw = wfGetDB( DB_MASTER );
 
                if ( $moveOverRedirect ) {
@@ -3267,12 +3373,21 @@ class Title {
                                $dbw->delete( 'externallinks', array( 'el_from' => $newid ), __METHOD__ );
                                $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ );
                                $dbw->delete( 'redirect', array( 'rd_from' => $newid ), __METHOD__ );
+                               $dbw->delete( 'page_props', array( 'pp_page' => $newid ), __METHOD__ );
                        }
                        // If the target page 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__
                        );
+                       
+                        if ( $wgEnableInterwikiTemplatesTracking && $wgGlobalDatabase ) {
+                               $dbw2 = wfGetDB( DB_MASTER, array(), $wgGlobalDatabase );
+                               $dbw2->delete( 'globaltemplatelinks',
+                                                       array(  'gtl_from_wiki' => wfGetID(),
+                                                                       'gtl_from_page' => $newid ),
+                                                       __METHOD__ );
+                       }
                }
 
                # Save a null revision in the page's history notifying of the move
@@ -3282,13 +3397,11 @@ class Title {
                }
                $nullRevId = $nullRevision->insertOn( $dbw );
 
-               $article = new Article( $this );
-               wfRunHooks( 'NewRevisionFromEditComplete', array( $article, $nullRevision, $latest, $wgUser ) );
-
+               $now = wfTimestampNow();
                # Change the name of the target page:
                $dbw->update( 'page',
                        /* SET */ array(
-                               'page_touched'   => $dbw->timestamp(),
+                               'page_touched'   => $dbw->timestamp( $now ),
                                'page_namespace' => $nt->getNamespace(),
                                'page_title'     => $nt->getDBkey(),
                                'page_latest'    => $nullRevId,
@@ -3298,43 +3411,40 @@ class Title {
                );
                $nt->resetArticleID( $oldid );
 
+               $article = new Article( $nt );
+               wfRunHooks( 'NewRevisionFromEditComplete',
+                       array( $article, $nullRevision, $latest, $wgUser ) );
+               $article->setCachedLastEditTime( $now );
+
                # Recreate the redirect, this time in the other direction.
                if ( $createRedirect || !$wgUser->isAllowed( 'suppressredirect' ) ) {
                        $mwRedir = MagicWord::get( 'redirect' );
                        $redirectText = $mwRedir->getSynonym( 0 ) . ' [[' . $nt->getPrefixedText() . "]]\n";
                        $redirectArticle = new Article( $this );
                        $newid = $redirectArticle->insertOn( $dbw );
-                       $redirectRevision = new Revision( array(
-                               'page'    => $newid,
-                               'comment' => $comment,
-                               '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 ), __METHOD__ );
-                       $dbw->insert( 'pagelinks',
-                               array(
-                                       'pl_from'      => $newid,
-                                       'pl_namespace' => $nt->getNamespace(),
-                                       'pl_title'     => $nt->getDBkey() ),
-                               __METHOD__ );
+                       if ( $newid ) { // sanity
+                               $redirectRevision = new Revision( array(
+                                       'page'    => $newid,
+                                       'comment' => $comment,
+                                       '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 ), __METHOD__ );
+                               $dbw->insert( 'pagelinks',
+                                       array(
+                                               'pl_from'      => $newid,
+                                               'pl_namespace' => $nt->getNamespace(),
+                                               'pl_title'     => $nt->getDBkey() ),
+                                       __METHOD__ );
+                       }
                        $redirectSuppressed = false;
                } else {
-                       // Get rid of old new page entries in Special:NewPages and RC.
-                       // Needs to be before $this->resetArticleID( 0 ).
-                       $dbw->delete( 'recentchanges', array(
-                                       'rc_timestamp' => $dbw->timestamp( $this->getEarliestRevTime() ),
-                                       'rc_namespace' => $oldns,
-                                       'rc_title' => $olddbk,
-                                       'rc_new' => 1
-                               ),
-                               __METHOD__
-                       );
-
                        $this->resetArticleID( 0 );
                        $redirectSuppressed = true;
                }
@@ -3641,65 +3751,68 @@ class Title {
         * @return Revision|Null if page doesn't exist
         */
        public function getFirstRevision( $flags = 0 ) {
-               $db = ( $flags & self::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 );
+               if ( $pageId ) {
+                       $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
+                       $row = $db->selectRow( 'revision', '*',
+                               array( 'rev_page' => $pageId ),
+                               __METHOD__,
+                               array( 'ORDER BY' => 'rev_timestamp ASC', 'LIMIT' => 1 )
+                       );
+                       if ( $row ) {
+                               return new Revision( $row );
+                       }
                }
+               return null;
        }
 
        /**
-        * Check if this is a new page
+        * Get the oldest revision timestamp of this page
         *
-        * @return bool
+        * @param $flags Int Title::GAID_FOR_UPDATE
+        * @return String: MW timestamp
         */
-       public function isNewPage() {
-               $dbr = wfGetDB( DB_SLAVE );
-               return (bool)$dbr->selectField( 'page', 'page_is_new', $this->pageCond(), __METHOD__ );
+       public function getEarliestRevTime( $flags = 0 ) {
+               $rev = $this->getFirstRevision( $flags );
+               return $rev ? $rev->getTimestamp() : null;
        }
 
        /**
-        * Get the oldest revision timestamp of this page
+        * Check if this is a new page
         *
-        * @return String: MW timestamp
+        * @return bool
         */
-       public function getEarliestRevTime() {
+       public function isNewPage() {
                $dbr = wfGetDB( DB_SLAVE );
-               if ( $this->exists() ) {
-                       $min = $dbr->selectField( 'revision',
-                               'MIN(rev_timestamp)',
-                               array( 'rev_page' => $this->getArticleId() ),
-                               __METHOD__ );
-                       return wfTimestampOrNull( TS_MW, $min );
-               }
-               return null;
+               return (bool)$dbr->selectField( 'page', 'page_is_new', $this->pageCond(), __METHOD__ );
        }
 
        /**
-        * Get the number of revisions between the given revision IDs.
+        * Get the number of revisions between the given revision.
         * Used for diffs and other things that really need it.
         *
-        * @param $old Int Revision ID.
-        * @param $new Int Revision ID.
-        * @return Int Number of revisions between these IDs.
+        * @param $old int|Revision Old revision or rev ID (first before range)
+        * @param $new int|Revision New revision or rev ID (first after range)
+        * @return Int Number of revisions between these revisions.
         */
        public function countRevisionsBetween( $old, $new ) {
+               if ( !( $old instanceof Revision ) ) {
+                       $old = Revision::newFromTitle( $this, (int)$old );
+               }
+               if ( !( $new instanceof Revision ) ) {
+                       $new = Revision::newFromTitle( $this, (int)$new );
+               }
+               if ( !$old || !$new ) {
+                       return 0; // nothing to compare
+               }
                $dbr = wfGetDB( DB_SLAVE );
-               return (int)$dbr->selectField( 'revision', 'count(*)', array(
-                               'rev_page' => intval( $this->getArticleId() ),
-                               'rev_id > ' . intval( $old ),
-                               'rev_id < ' . intval( $new )
-                       ), __METHOD__
+               return (int)$dbr->selectField( 'revision', 'count(*)',
+                       array(
+                               'rev_page' => $this->getArticleId(),
+                               'rev_timestamp > ' . $dbr->addQuotes( $dbr->timestamp( $old->getTimestamp() ) ),
+                               'rev_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( $new->getTimestamp() ) )
+                       ),
+                       __METHOD__
                );
        }
 
@@ -3707,23 +3820,31 @@ class Title {
         * Get the number of authors between the given revision IDs.
         * Used for diffs and other things that really need it.
         *
-        * @param $fromRevId Int Revision ID (first before range)
-        * @param $toRevId Int Revision ID (first after range)
+        * @param $old int|Revision Old revision or rev ID (first before range)
+        * @param $new int|Revision New revision or rev ID (first after range)
         * @param $limit Int Maximum number of authors
-        * @param $flags Int Title::GAID_FOR_UPDATE
-        * @return Int
+        * @return Int Number of revision authors between these revisions.
         */
-       public function countAuthorsBetween( $fromRevId, $toRevId, $limit, $flags = 0 ) {
-               $db = ( $flags & self::GAID_FOR_UPDATE ) ? wfGetDB( DB_MASTER ) : wfGetDB( DB_SLAVE );
-               $res = $db->select( 'revision', 'DISTINCT rev_user_text',
+       public function countAuthorsBetween( $old, $new, $limit ) {
+               if ( !( $old instanceof Revision ) ) {
+                       $old = Revision::newFromTitle( $this, (int)$old );
+               }
+               if ( !( $new instanceof Revision ) ) {
+                       $new = Revision::newFromTitle( $this, (int)$new );
+               }
+               if ( !$old || !$new ) {
+                       return 0; // nothing to compare
+               }
+               $dbr = wfGetDB( DB_SLAVE );
+               $res = $dbr->select( 'revision', 'DISTINCT rev_user_text',
                        array(
                                'rev_page' => $this->getArticleID(),
-                               'rev_id > ' . (int)$fromRevId,
-                               'rev_id < ' . (int)$toRevId
+                               'rev_timestamp > ' . $dbr->addQuotes( $dbr->timestamp( $old->getTimestamp() ) ),
+                               'rev_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( $new->getTimestamp() ) )
                        ), __METHOD__,
-                       array( 'LIMIT' => $limit )
+                       array( 'LIMIT' => $limit + 1 ) // add one so caller knows it was truncated
                );
-               return (int)$db->numRows( $res );
+               return (int)$dbr->numRows( $res );
        }
 
        /**
@@ -3739,6 +3860,18 @@ class Title {
                        && $this->getDBkey() === $title->getDBkey();
        }
 
+       /**
+        * Check if this title is a subpage of another title
+        *
+        * @param $title Title
+        * @return Bool
+        */
+       public function isSubpageOf( Title $title ) {
+               return $this->getInterwiki() === $title->getInterwiki()
+                       && $this->getNamespace() == $title->getNamespace()
+                       && strpos( $this->getDBkey(), $title->getDBkey() . '/' ) === 0;
+       }
+
        /**
         * Callback for usort() to do title sorts by (namespace, title)
         *
@@ -3804,7 +3937,7 @@ class Title {
                                return (bool)wfFindFile( $this );
                        case NS_SPECIAL:
                                // valid special page
-                               return SpecialPage::exists( $this->getDBkey() );
+                               return SpecialPageFactory::exists( $this->getDBkey() );
                        case NS_MAIN:
                                // selflink, possibly with fragment
                                return $this->mDbkeyform == '';
@@ -4031,7 +4164,7 @@ class Title {
         */
        public function isSpecial( $name ) {
                if ( $this->getNamespace() == NS_SPECIAL ) {
-                       list( $thisName, /* $subpage */ ) = SpecialPage::resolveAliasWithSubpage( $this->getDBkey() );
+                       list( $thisName, /* $subpage */ ) = SpecialPageFactory::resolveAlias( $this->getDBkey() );
                        if ( $name == $thisName ) {
                                return true;
                        }
@@ -4047,9 +4180,9 @@ class Title {
         */
        public function fixSpecialName() {
                if ( $this->getNamespace() == NS_SPECIAL ) {
-                       $canonicalName = SpecialPage::resolveAlias( $this->mDbkeyform );
+                       list( $canonicalName, /*...*/ ) = SpecialPageFactory::resolveAlias( $this->mDbkeyform );
                        if ( $canonicalName ) {
-                               $localName = SpecialPage::getLocalNameFor( $canonicalName );
+                               $localName = SpecialPageFactory::getLocalNameFor( $canonicalName );
                                if ( $localName != $this->mDbkeyform ) {
                                        return Title::makeTitle( NS_SPECIAL, $localName );
                                }
@@ -4207,6 +4340,12 @@ class Title {
         */
        public function getCategorySortkey( $prefix = '' ) {
                $unprefixed = $this->getText();
+
+               // Anything that uses this hook should only depend
+               // on the Title object passed in, and should probably
+               // tell the users to run updateCollations.php --force
+               // in order to re-sort existing category relations.
+               wfRunHooks( 'GetDefaultSortkey', array( $this, &$unprefixed ) );
                if ( $prefix !== '' ) {
                        # Separate with a line feed, so the unprefixed part is only used as
                        # a tiebreaker when two pages have the exact same prefix.
@@ -4217,4 +4356,36 @@ class Title {
                }
                return $unprefixed;
        }
+
+       /**
+        * Get the language in which the content of this page is written.
+        * Defaults to $wgContLang, but in certain cases it can be e.g.
+        * $wgLang (such as special pages, which are in the user language).
+        *
+        * @since 1.18
+        * @return object Language
+        */
+       public function getPageLanguage() {
+               global $wgLang;
+               if ( $this->getNamespace() == NS_SPECIAL ) {
+                       // special pages are in the user language
+                       return $wgLang;
+               } elseif ( $this->isRedirect() ) {
+                       // the arrow on a redirect page is aligned according to the user language
+                       return $wgLang;
+               } elseif ( $this->isCssOrJsPage() ) {
+                       // css/js should always be LTR and is, in fact, English
+                       return wfGetLangObj( 'en' );
+               } elseif ( $this->getNamespace() == NS_MEDIAWIKI ) {
+                       // Parse mediawiki messages with correct target language
+                       list( /* $unused */, $lang ) = MessageCache::singleton()->figureMessage( $this->getText() );
+                       return wfGetLangObj( $lang );
+               }
+               global $wgContLang;
+               // If nothing special, it should be in the wiki content language
+               $pageLang = $wgContLang;
+               // Hook at the end because we don't want to override the above stuff
+               wfRunHooks( 'PageContentLanguage', array( $this, &$pageLang, $wgLang ) );
+               return wfGetLangObj( $pageLang );
+       }
 }