From e1f9ad4484c3b1bb9b252be957bfc8e3f0ea952d Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Wed, 16 Nov 2005 09:26:44 +0000 Subject: [PATCH] * (bug 3939) Don't try to load text for interwiki redirect target --- RELEASE-NOTES | 1 + includes/Article.php | 20 +++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 95f24289cd..6bedbc6345 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -227,6 +227,7 @@ fully support the editing toolbar, but was found to be too confusing. * Check for unbalanced HTML tags on raw sigs (markup allowed, but show a warning in prefs and use default sig if not balanced) * (bug 2740) Accept image deletions on 'enter' submit from MSIE +* (bug 3939) Don't try to load text for interwiki redirect target === Caveats === diff --git a/includes/Article.php b/includes/Article.php index 5e13bf7ec6..316d73bc27 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -421,15 +421,17 @@ class Article { return false; } } - $redirData = $this->pageDataFromTitle( $dbr, $rt ); - if( $redirData ) { - $redirRev = Revision::newFromId( $redirData->page_latest ); - if( !is_null( $redirRev ) ) { - $this->mRedirectedFrom = $this->mTitle->getPrefixedText(); - $this->mTitle = $rt; - $data = $redirData; - $this->loadPageData( $data ); - $revision = $redirRev; + if( $rt->getInterwiki() == '' ) { + $redirData = $this->pageDataFromTitle( $dbr, $rt ); + if( $redirData ) { + $redirRev = Revision::newFromId( $redirData->page_latest ); + if( !is_null( $redirRev ) ) { + $this->mRedirectedFrom = $this->mTitle->getPrefixedText(); + $this->mTitle = $rt; + $data = $redirData; + $this->loadPageData( $data ); + $revision = $redirRev; + } } } } -- 2.20.1