Merge "SpecialMovepage: Correctly apply target namespace to subpages"

diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index bd80bec..cac324a 100644 (file)
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -698,7 +698,10 @@ class MovePageForm extends UnlistedSpecialPage {
                                $oldSubpage->getDBkey()
                        );
 
-                       if ( $oldSubpage->isTalkPage() ) {
+                       if ( $oldSubpage->isSubpage() && ( $ot->isTalkPage() xor $nt->isTalkPage() ) ) {
+                               // Moving a subpage from a subject namespace to a talk namespace or vice-versa
+                               $newNs = $nt->getNamespace();
+                       } elseif ( $oldSubpage->isTalkPage() ) {
                                $newNs = $nt->getTalkPage()->getNamespace();
                        } else {
                                $newNs = $nt->getSubjectPage()->getNamespace();