bug 15849 - Trying to move a page onto an interwiki page produces an inappropriate...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index dc7a996..8ca96f6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -416,6 +416,8 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 1941) Explicitly tell browsers to use a monospaced font for textareas.
   Safari apparently defaults to a proportional font, which can make editing
   pages with preformatted text difficult
+* (bug 15849) Special:Movepage now throws a more specific error when trying to 
+  move a title to an interwiki target
 
 === API changes in 1.14 ===
 

diff --git a/includes/Title.php b/includes/Title.php
index a62d6aa..356f448 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2414,6 +2414,9 @@ class Title {
                if( !$this->isMovable() ) {
                        $errors[] = array( 'immobile-source-namespace', $this->getNsText() );
                }
+               if ( $nt->getInterwiki() != '' ) {
+                       $errors[] = array( 'immobile-target-namespace-iw', $nt->getInterwiki() );
+               }
                if ( !$nt->isMovable() ) {
                        $errors[] = array('immobile-target-namespace', $nt->getNsText() );
                }

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 94bc56e..b7334e8 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2739,6 +2739,7 @@ cannot move a page over itself.',
 'immobile-target-namespace' => 'Cannot move pages into namespace "$1"',
 'immobile-source-page'      => 'This page is not movable.',
 'immobile-target-page'      => 'Cannot move to that destination title.',
+'immobile-target-namespace-iw' => 'Cannot move pages to interwiki link "$1"',
 'imagenocrossnamespace'     => 'Cannot move file to non-file namespace',
 'imagetypemismatch'         => 'The new file extension does not match its type',
 'imageinvalidfilename'      => 'The target file name is invalid',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index cfd2562..9cec2e6 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1896,6 +1896,7 @@ $wgMessageStructure = array(
                'selfmove',
                'immobile-source-namespace',
                'immobile-target-namespace',
+               'immobile-target-namespace-iw',
                'immobile-source-page',
                'immobile-target-page',
                'immobile_namespace',