X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FcleanupTitles.php;h=5b441f90f1fe3d6244a87d2913b8f6562c9712b8;hb=8269ed4dfd5e4395e25945b1fa2ed391684606ed;hp=50e17d8dad2b61beb7ffec7426b6f732b2c8415a;hpb=d5a7166771613dfe4ed9fb75fa5efeced6134bd1;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index 50e17d8dad..5b441f90f1 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -137,7 +137,8 @@ class TitleCleanup extends TableCleanup {
 			|| $title->getInterwiki()
 			|| !$title->canExist()
 		) {
-			if ( $title->getInterwiki() || !$title->canExist() ) {
+			$titleImpossible = $title->getInterwiki() || !$title->canExist();
+			if ( $titleImpossible ) {
 				$prior = $title->getPrefixedDBkey();
 			} else {
 				$prior = $title->getDBkey();
@@ -155,7 +156,12 @@ class TitleCleanup extends TableCleanup {
 				$ns = 0;
 			}
 
-			$clean = 'Broken/' . $prior;
+			if ( !$titleImpossible && !$title->exists() ) {
+				// Looks like the current title, after cleaning it up, is valid and available
+				$clean = $prior;
+			} else {
+				$clean = 'Broken/' . $prior;
+			}
 			$verified = Title::makeTitleSafe( $ns, $clean );
 			if ( !$verified || $verified->exists() ) {
 				$blah = "Broken/id:" . $row->page_id;
@@ -165,7 +171,7 @@ class TitleCleanup extends TableCleanup {
 			$title = $verified;
 		}
 		if ( is_null( $title ) ) {
-			$this->error( "Something awry; empty title.", true );
+			$this->fatalError( "Something awry; empty title." );
 		}
 		$ns = $title->getNamespace();
 		$dest = $title->getDBkey();
@@ -189,5 +195,5 @@ class TitleCleanup extends TableCleanup {
 	}
 }
 
-$maintClass = "TitleCleanup";
+$maintClass = TitleCleanup::class;
 require_once RUN_MAINTENANCE_IF_MAIN;