From: Brion Vibber Date: Mon, 26 Nov 2007 20:26:00 +0000 (+0000) Subject: * namespaceDupes.php no longer dies when coming across an illegal title X-Git-Tag: 1.31.0-rc.0~50711 X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=64df3ab1156d8152959f6f3072ceaec14c7841c7;p=lhc%2Fweb%2Fwiklou.git * namespaceDupes.php no longer dies when coming across an illegal title --- diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 477192e203..621b754c24 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -193,7 +193,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * Make sure that the correct log entries are shown on Special:Userrights even for users with special characters in their names * The number of watching users in watchlists was always reported as 1 - +* namespaceDupes.php no longer dies when coming across an illegal title + + == Parser changes in 1.12 == The parser pass order has changed from diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php index 323aad59ef..4494aaba7d 100644 --- a/maintenance/namespaceDupes.php +++ b/maintenance/namespaceDupes.php @@ -175,6 +175,16 @@ class NamespaceConflictChecker { function reportConflict( $row, $suffix ) { $newTitle = Title::makeTitleSafe( $row->namespace, $row->title ); + if( !$newTitle ) { + // Title is also an illegal title... + // For the moment we'll let these slide to cleanupTitles or whoever. + printf( "... %d (0,\"%s\")\n", + $row->id, + $row->oldtitle ); + echo "... *** cannot resolve automatically; illegal title ***\n"; + return false; + } + printf( "... %d (0,\"%s\") -> (%d,\"%s\") [[%s]]\n", $row->id, $row->oldtitle,