* (bug 3939) Don't try to load text for interwiki redirect target

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 95f2428..6bedbc6 100644 (file)
--- 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 5e13bf7..316d73b 100644 (file)
--- 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;
+                                               }
                                        }
                                }
                        }