* Allow page moves over historyless self-redirects. Such are usually created

  as part of namespace rearrangements, and it's easier to clean them up if
  we can move over them.
* Show some error results in moveBatch.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3b79016..9a2e7aa 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -591,6 +591,10 @@ Some default configuration options have changed:
 * Added Latvian localization (lv)
 * (bug 6472) Fix regression in Special:Export with multiple pages
 * Update to Macedonian translation (mk)
+* Allow page moves over historyless self-redirects. Such are usually created
+  as part of namespace rearrangements, and it's easier to clean them up if
+  we can move over them.
+* Show some error results in moveBatch.php
 
 
 == Compatibility ==

diff --git a/includes/Title.php b/includes/Title.php
index 6c29bc6..da0e589 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2009,19 +2009,24 @@ class Title {
 
                if ( !$obj || 0 == $obj->page_is_redirect ) {
                        # Not a redirect
+                       wfDebug( __METHOD__ . ": not a redirect\n" );
                        return false;
                }
                $text = Revision::getRevisionText( $obj );
 
                # Does the redirect point to the source?
+               # Or is it a broken self-redirect, usually caused by namespace collisions?
                if ( preg_match( "/\\[\\[\\s*([^\\]\\|]*)]]/", $text, $m ) ) {
                        $redirTitle = Title::newFromText( $m[1] );
                        if( !is_object( $redirTitle ) ||
-                               $redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() ) {
+                               ( $redirTitle->getPrefixedDBkey() != $this->getPrefixedDBkey() &&
+                               $redirTitle->getPrefixedDBkey() != $nt->getPrefixedDBkey() ) ) {
+                               wfDebug( __METHOD__ . ": redirect points to other page\n" );
                                return false;
                        }
                } else {
                        # Fail safe
+                       wfDebug( __METHOD__ . ": failsafe\n" );
                        return false;
                }
 

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index ae47008..8d7141c 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -68,7 +68,10 @@ for ( $linenum = 1; !feof( $file ); $linenum++ ) {
 
        print $source->getPrefixedText();
        $dbw->begin();
-       $source->moveTo( $dest, false, $reason );
+       $err = $source->moveTo( $dest, false, $reason );
+       if( $err !== true ) {
+               print "\nFAILED: $err";
+       }
        $dbw->immediateCommit();
        print "\n";