Revert merge of DismissableSiteNotice into the core (r41679 and subsequent edits...

[lhc/web/wiklou.git] / maintenance / namespaceDupes.php

diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 2b213e9..92296eb 100644 (file)
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -17,13 +17,18 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 # http://www.gnu.org/copyleft/gpl.html
 
+/**
+ * @file
+ * @ingroup Maintenance
+ */
+
 $options = array( 'fix', 'suffix', 'help' );
 
 /** */
 require_once( 'commandLine.inc' );
 
 if(isset( $options['help'] ) ) {
-print <<<END
+print <<<ENDS
 usage: namespaceDupes.php [--fix] [--suffix=<text>] [--help]
     --help          : this help message
     --fix           : attempt to automatically fix errors
@@ -33,7 +38,7 @@ usage: namespaceDupes.php [--fix] [--suffix=<text>] [--help]
                       in place of the standard namespace list.
     --verbose       : Display output for checked namespaces without conflicts
 
-END;
+ENDS;
 die;
 }
 
@@ -218,8 +223,14 @@ 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;
+                       }
                        echo "...  *** using suffixed form [[" . $title->getPrefixedText() . "]] ***\n";
                }
                $tables = array( 'page' );