* (bug 14386) Fix subpage namespace oddity when moving a talk page

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5ba98eb..6b92d83 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -326,6 +326,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14258, 14368) Fix for subpage renames in replication environments
 * (bug 14367) Failed block no longer adds phantom watchlist entry
 * (bug 14385) "Move subpages" option no longer tries to move to invalid titles
+* (bug 14386) Fix subpage namespace oddity when moving a talk page
 
 
 === API changes in 1.13 ===

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index 812b97c..d845370 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -367,8 +367,11 @@ class MovePageForm {
                                $nt->getDBKey(),
                                $oldPage->getDBKey()
                        );
-                       # The following line is an atrocious hack.  Kill it with fire.
-                       $newNs = $nt->getNamespace() + ($oldPage->getNamespace() & 1);
+                       if( $oldPage->isTalkPage() ) {
+                               $newNs = $nt->getTalkPage()->getNamespace();
+                       } else {
+                               $newNs = $nt->getSubjectPage()->getNamespace();
+                       }
                        # Bug 14385: we need makeTitleSafe because the new page names may
                        # be longer than 255 characters.
                        $newPage = Title::makeTitleSafe( $newNs, $newPageName );