MediaWiki 1.15.0

[autoinstalls/mediawiki.git] / maintenance / namespaceDupes.php

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index fcc7d3a12cece878a30f59bc5f0e0308bcf5389d..c5b3ce968160969887cc32471537c3611e46e3da 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -224,12 +224,19 @@ class NamespaceConflictChecker {
        function resolveConflict( $row, $resolvable, $suffix ) {
                if( !$resolvable ) {
                        echo "...  *** old title {$row->title}\n";
-                       $row->title .= $suffix;
-                       echo "...  *** new title {$row->title}\n";
-                       $title = Title::makeTitleSafe( $row->namespace, $row->title );
-                       if ( ! $title ) {
-                               echo "... !!! invalid title\n";
-                               return false;
+                       while( true ) {
+                               $row->title .= $suffix;
+                               echo "...  *** new title {$row->title}\n";
+                               $title = Title::makeTitleSafe( $row->namespace, $row->title );
+                               if ( ! $title ) {
+                                       echo "... !!! invalid title\n";
+                                       return false;
+                               }
+                               if ( $id = $title->getArticleId() ) {
+                                       echo "...  *** page exists with ID $id ***\n";
+                               } else {        
+                                       break;
+                               }
                        }
                        echo "...  *** using suffixed form [[" . $title->getPrefixedText() . "]] ***\n";
                }