* Fix talk page move handling

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index ae758e8..1af0bbc 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -539,6 +539,11 @@ of MediaWiki:Newpagetext) to &action=edit, if page is new.
 * Fix escaping in page move template.
 
 
+== Changes since 1.5beta3 ==
+
+* Fix talk page move handling
+
+
 === Caveats ===
 
 Some output, particularly involving user-supplied inline HTML, may not

diff --git a/includes/SpecialMovepage.php b/includes/SpecialMovepage.php
index fb66e31..70c8a4f 100644 (file)
--- a/includes/SpecialMovepage.php
+++ b/includes/SpecialMovepage.php
@@ -206,17 +206,11 @@ class MovePageForm {
                # (2) the namespaces are not themselves talk namespaces, and of course
                # (3) it exists.
                if ( ( $wgRequest->getVal('wpMovetalk') == 1 ) &&
-                    ( ! Namespace::isTalk( $ons ) ) &&
-                    ( ! Namespace::isTalk( $nns ) ) ) {
+                    !$ot->isTalkPage() &&
+                    !$nt->isTalkPage() ) {
                        
-                       # get old talk page namespace
-                       $ons = Namespace::getTalk( $ons );
-                       # get new talk page namespace
-                       $nns = Namespace::getTalk( $nns );
-                       
-                       # make talk page title objects
-                       $ott = Title::makeTitle( $ons, $ot->getDBkey() );
-                       $ntt = Title::makeTitle( $nns, $nt->getDBkey() );
+                       $ott = $ot->getTalkPage();
+                       $ntt = $nt->getTalkPage();
 
                        # Attempt the move
                        $error = $ott->moveTo( $ntt, true, $this->reason );