Rename $wgVaryOnXFPForAPI (introduced in r93818) to $wgVaryOnXFP and extend it to...
[lhc/web/wiklou.git] / includes / Title.php
index fc80861..6d1cfec 100644 (file)
@@ -47,7 +47,6 @@ class Title {
         */
        const GAID_FOR_UPDATE = 1;
 
-
        /**
         * @name Private member variables
         * Please use the accessor functions instead.
@@ -639,9 +638,17 @@ class Title {
                        }
                }
 
+               // Strip off subpages
+               $pagename = $this->getText();
+               if ( strpos( $pagename, '/' ) !== false ) {
+                       list( $username , ) = explode( '/', $pagename, 2 );
+               } else {
+                       $username = $pagename;
+               }
+
                if ( $wgContLang->needsGenderDistinction() &&
                                MWNamespace::hasGenderDistinction( $this->mNamespace ) ) {
-                       $gender = GenderCache::singleton()->getGenderOf( $this->getText(), __METHOD__ );
+                       $gender = GenderCache::singleton()->getGenderOf( $username, __METHOD__ );
                        return $wgContLang->getGenderNsText( $this->mNamespace, $gender );
                }
 
@@ -757,6 +764,7 @@ class Title {
                return $this->mPrefixedText;
        }
 
+       /**
        /**
         * Get the prefixed title with spaces, plus any fragment
         * (part beginning with '#')
@@ -837,36 +845,18 @@ class Title {
        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();
 
-               wfRunHooks( 'GetFullURL', array( &$this, &$url, $query ) );
+               wfRunHooks( 'GetFullURL', array( &$this, &$url, $query, $variant ) );
                return $url;
        }
 
@@ -883,25 +873,26 @@ class Title {
         */
        public function getLocalURL( $query = '', $variant = false ) {
                global $wgArticlePath, $wgScript, $wgServer, $wgRequest;
-               global $wgVariantArticlePath, $wgContLang;
+               global $wgVariantArticlePath;
 
                if ( is_array( $query ) ) {
                        $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 == '' ) {
-                               if ( $variant != false && $wgContLang->hasVariants() ) {
+                               if ( $variant != false && $this->getPageLanguage()->hasVariants() ) {
                                        if ( !$wgVariantArticlePath ) {
                                                $variantArticlePath =  "$wgScript?title=$1&variant=$2"; // default
                                        } else {
@@ -911,6 +902,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;
@@ -940,13 +932,15 @@ class Title {
                                }
                        }
 
+                       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;
        }
 
@@ -1002,11 +996,22 @@ class Title {
                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
@@ -1014,8 +1019,25 @@ class Title {
        public function getInternalURL( $query = '', $variant = false ) {
                global $wgInternalServer, $wgServer;
                $server = $wgInternalServer !== false ? $wgInternalServer : $wgServer;
-               $url = $server . $this->getLocalURL( $query, $variant );
-               wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query ) );
+               $url = wfExpandUrl( $server . $this->getLocalURL( $query, $variant ), PROTO_HTTP );
+               wfRunHooks( 'GetInternalURL', array( &$this, &$url, $query, $variant ) );
+               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 ) {
+               $url = wfExpandUrl( $this->getLocalURL( $query, $variant ) . $this->getFragmentForURL(), PROTO_CANONICAL );
+               wfRunHooks( 'GetCanonicalURL', array( &$this, &$url, $query, $variant ) );
                return $url;
        }
 
@@ -1235,7 +1257,7 @@ class Title {
         */
        private function checkQuickPermissions( $action, $user, $errors, $doExpensiveQueries, $short ) {
                $ns = $this->getNamespace();
-               
+
                if ( $action == 'create' ) {
                        if ( ( $this->isTalkPage() && !$user->isAllowed( 'createtalk', $ns ) ) ||
                                 ( !$this->isTalkPage() && !$user->isAllowed( 'createpage', $ns ) ) ) {
@@ -1256,9 +1278,9 @@ class Title {
                        if ( !$user->isAllowed( 'move', $ns) ) {
                                // User can't move anything
 
-                               $userCanMove = in_array( 'move', User::getGroupPermissions( 
+                               $userCanMove = in_array( 'move', User::getGroupPermissions(
                                        array( 'user' ), $ns ), true );
-                               $autoconfirmedCanMove = in_array( 'move', User::getGroupPermissions( 
+                               $autoconfirmedCanMove = in_array( 'move', User::getGroupPermissions(
                                        array( 'autoconfirmed' ), $ns ), true );
 
                                if ( $user->isAnon() && ( $userCanMove || $autoconfirmedCanMove ) ) {
@@ -1400,8 +1422,6 @@ 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 ) ) {
@@ -1513,8 +1533,8 @@ 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'] );
                                }
@@ -1526,7 +1546,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 ) ) {
@@ -1578,7 +1598,7 @@ class Title {
                        if ( $reason == '' ) {
                                $reason = wfMsg( 'blockednoreason' );
                        }
-                       $ip = wfGetIP();
+                       $ip = $user->getRequest()->getIP();
 
                        if ( is_numeric( $id ) ) {
                                $name = User::whoIs( $id );
@@ -1757,7 +1777,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;
        }
 
        /**
@@ -1863,6 +1890,7 @@ class Title {
         * acidentally creating new bugs where $title->equals( Title::newFromText() )
         * ends up reporting something differently than $title->isMainPage();
         *
+        * @since 1.18
         * @return Bool
         */
        public function isMainPage() {
@@ -1944,6 +1972,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?
@@ -1951,8 +1990,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;
        }
 
        /**
@@ -2006,11 +2047,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 ) );
        }
@@ -2019,11 +2061,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 ) );
        }
@@ -2340,37 +2383,21 @@ 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( $includeSuppressed = false ) {
+       public function isDeleted() {
                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(*)',
-                               $conditions,
+                               array( 'ar_namespace' => $this->getNamespace(), 'ar_title' => $this->getDBkey() ),
                                __METHOD__
                        );
                        if ( $this->getNamespace() == NS_FILE ) {
-                               $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,
+                               $n += $dbr->selectField( 'filearchive', 'COUNT(*)',
+                                       array( 'fa_name' => $this->getDBkey() ),
                                        __METHOD__
                                );
                        }
@@ -2501,7 +2528,7 @@ class Title {
         */
        public function resetArticleID( $newid ) {
                $linkCache = LinkCache::singleton();
-               $linkCache->clearBadLink( $this->getPrefixedDBkey() );
+               $linkCache->clearLink( $this );
 
                if ( $newid === false ) {
                        $this->mArticleID = -1;
@@ -2783,7 +2810,7 @@ class Title {
                        : $dbkey;
 
                // Any remaining initial :s are illegal.
-               if ( $dbkey !== '' && ':' == $dbkey { 0 } ) {
+               if ( $dbkey !== '' && ':' == $dbkey[0] ) {
                        return false;
                }
 
@@ -2871,7 +2898,7 @@ class Title {
                        foreach ( $res as $row ) {
                                $titleObj = Title::makeTitle( $row->page_namespace, $row->page_title );
                                if ( $titleObj ) {
-                                       $linkCache->addGoodLinkObj( $row->page_id, $titleObj, $row->page_len, $row->page_is_redirect, $row->page_latest );
+                                       $linkCache->addGoodLinkObjFromRow( $titleObj, $row );
                                        $retVal[] = $titleObj;
                                }
                        }
@@ -3080,9 +3107,7 @@ class Title {
 
                $errors = array();
 
-               if ( $nt->getNamespace() != NS_FILE ) {
-                       $errors[] = array( 'imagenocrossnamespace' );
-               }
+               // wfFindFile( $nt ) / wfLocalFile( $nt ) is not allowed until below
 
                $file = wfLocalFile( $this );
                if ( $file->exists() ) {
@@ -3094,6 +3119,15 @@ class Title {
                        }
                }
 
+               if ( $nt->getNamespace() != NS_FILE ) {
+                       $errors[] = array( 'imagenocrossnamespace' );
+                       // From here we want to do checks on a file object, so if we can't
+                       // create one, we must return.
+                       return $errors;
+               }
+
+               // wfFindFile( $nt ) / wfLocalFile( $nt ) is allowed below here
+
                $destFile = wfLocalFile( $nt );
                if ( !$wgUser->isAllowed( 'reupload-shared' ) && !$destFile->exists() && wfFindFile( $nt ) ) {
                        $errors[] = array( 'file-exists-sharedrepo' );
@@ -3119,8 +3153,8 @@ 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
+               // 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 );
@@ -3131,6 +3165,9 @@ class Title {
                                }
                        }
                }
+               // Clear RepoGroup process cache
+               RepoGroup::singleton()->clearCache( $this );
+               RepoGroup::singleton()->clearCache( $nt ); # clear false negative cache
 
                $dbw->begin(); # If $file was a LocalFile, its transaction would have closed our own.
                $pageid = $this->getArticleID( self::GAID_FOR_UPDATE );
@@ -3232,6 +3269,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,
@@ -3265,11 +3303,28 @@ class Title {
        private function moveToInternal( &$nt, $reason = '', $createRedirect = true ) {
                global $wgUser, $wgContLang;
 
-               $moveOverRedirect = $nt->exists();
+               if ( $nt->exists() ) {
+                       $moveOverRedirect = true;
+                       $logType = 'move_redir';
+               } else {
+                       $moveOverRedirect = false;
+                       $logType = 'move';
+               }
 
-               $commentMsg = ( $moveOverRedirect ? '1movedto2_redir' : '1movedto2' );
-               $comment = wfMsgForContent( $commentMsg, $this->getPrefixedText(), $nt->getPrefixedText() );
+               $redirectSuppressed = !$createRedirect && $wgUser->isAllowed( 'suppressredirect' );
 
+               $logEntry = new ManualLogEntry( 'move', $logType );
+               $logEntry->setPerformer( $wgUser );
+               $logEntry->setTarget( $this );
+               $logEntry->setComment( $reason );
+               $logEntry->setParameters( array(
+                       '4::target' => $nt->getPrefixedText(),
+                       '5::noredir' => $redirectSuppressed ? '1': '0',
+               ) );
+
+               $formatter = LogFormatter::newFromEntry( $logEntry );
+               $formatter->setContext( RequestContext::newExtraneousContext( $this ) );
+               $comment = $formatter->getPlainActionText();
                if ( $reason ) {
                        $comment .= wfMsgForContent( 'colon-separator' ) . $reason;
                }
@@ -3279,9 +3334,6 @@ class Title {
                $oldid = $this->getArticleID();
                $latest = $this->getLatestRevID();
 
-               $oldns = $this->getNamespace();
-               $olddbk = $this->getDBkey();
-
                $dbw = wfGetDB( DB_MASTER );
 
                if ( $moveOverRedirect ) {
@@ -3308,7 +3360,9 @@ class Title {
                                $dbw->delete( 'templatelinks', array( 'tl_from' => $newid ), __METHOD__ );
                                $dbw->delete( 'externallinks', array( 'el_from' => $newid ), __METHOD__ );
                                $dbw->delete( 'langlinks', array( 'll_from' => $newid ), __METHOD__ );
+                               $dbw->delete( 'iwlinks', array( 'iwl_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',
@@ -3324,10 +3378,11 @@ class Title {
                }
                $nullRevId = $nullRevision->insertOn( $dbw );
 
+               $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,
@@ -3338,7 +3393,9 @@ class Title {
                $nt->resetArticleID( $oldid );
 
                $article = new Article( $nt );
-               wfRunHooks( 'NewRevisionFromEditComplete', array( $article, $nullRevision, $latest, $wgUser ) );
+               wfRunHooks( 'NewRevisionFromEditComplete',
+                       array( $article, $nullRevision, $latest, $wgUser ) );
+               $article->setCachedLastEditTime( $now );
 
                # Recreate the redirect, this time in the other direction.
                if ( $createRedirect || !$wgUser->isAllowed( 'suppressredirect' ) ) {
@@ -3346,45 +3403,34 @@ class Title {
                        $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__ );
-                       $redirectSuppressed = false;
+                       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__ );
+                       }
                } 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;
                }
 
                # Log the move
-               $log = new LogPage( 'move' );
-               $logType = ( $moveOverRedirect ? 'move_redir' : 'move' );
-               $log->addEntry( $logType, $this, $reason, array( 1 => $nt->getPrefixedText(), 2 => $redirectSuppressed ) );
+               $logid = $logEntry->insert();
+               $logEntry->publish( $logid );
 
                # Purge caches for old and new titles
                if ( $moveOverRedirect ) {
@@ -3530,6 +3576,9 @@ class Title {
                }
                # Get the article text
                $rev = Revision::newFromTitle( $nt );
+               if( !is_object( $rev ) ){
+                       return false;
+               }
                $text = $rev->getText();
                # Does the redirect point to the source?
                # Or is it a broken self-redirect, usually caused by namespace collisions?
@@ -3792,6 +3841,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)
         *
@@ -3863,7 +3924,7 @@ class Title {
                                return $this->mDbkeyform == '';
                        case NS_MEDIAWIKI:
                                // known system message
-                               return $this->getDefaultMessageText() !== false;
+                               return $this->hasSourceText() !== false;
                        default:
                                return false;
                }
@@ -3893,8 +3954,13 @@ class Title {
 
                if ( $this->mNamespace == NS_MEDIAWIKI ) {
                        // If the page doesn't exist but is a known system message, default
-                       // message content will be displayed, same for language subpages
-                       return $this->getDefaultMessageText() !== false;
+                       // message content will be displayed, same for language subpages-
+                       // Use always content language to avoid loading hundreds of languages
+                       // to get the link color.
+                       global $wgContLang;
+                       list( $name, $lang ) = MessageCache::singleton()->figureMessage( $wgContLang->lcfirst( $this->getText() ) );
+                       $message = wfMessage( $name )->inLanguage( $wgContLang )->useDatabase( false );
+                       return $message->exists();
                }
 
                return false;
@@ -4100,9 +4166,9 @@ class Title {
         */
        public function fixSpecialName() {
                if ( $this->getNamespace() == NS_SPECIAL ) {
-                       list( $canonicalName, /*...*/ ) = SpecialPageFactory::resolveAlias( $this->mDbkeyform );
+                       list( $canonicalName, $par ) = SpecialPageFactory::resolveAlias( $this->mDbkeyform );
                        if ( $canonicalName ) {
-                               $localName = SpecialPageFactory::getLocalNameFor( $canonicalName );
+                               $localName = SpecialPageFactory::getLocalNameFor( $canonicalName, $par );
                                if ( $localName != $this->mDbkeyform ) {
                                        return Title::makeTitle( NS_SPECIAL, $localName );
                                }
@@ -4282,6 +4348,7 @@ class Title {
         * 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() {
@@ -4289,9 +4356,6 @@ class Title {
                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' );
@@ -4308,37 +4372,3 @@ class Title {
                return wfGetLangObj( $pageLang );
        }
 }
-
-/**
- * A BadTitle is generated in MediaWiki::parseTitle() if the title is invalid; the
- * software uses this to display an error page.  Internally it's basically a Title
- * for an empty special page
- */
-class BadTitle extends Title {
-       public function __construct(){
-               $this->mTextform = '';
-               $this->mUrlform = '';
-               $this->mDbkeyform = '';
-               $this->mNamespace = NS_SPECIAL; // Stops talk page link, etc, being shown
-       }
-
-       public function exists(){
-               return false;
-       }
-
-       public function getPrefixedText(){
-               return '';
-       }
-
-       public function getText(){
-               return '';
-       }
-
-       public function getPrefixedURL(){
-               return '';
-       }
-
-       public function getPrefixedDBKey(){
-               return '';
-       }
-}