X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2FcleanupTitles.php;h=8c782d996406148e2493078bf5310eea97cba0ef;hb=4eff5204d9ec6eb09df70d2fe017a2146cfa4238;hp=ccc64068093e619936633162982f8544e8ad536a;hpb=dae4c94d893057345f62a3d498fb85c0a54de5a6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index ccc6406809..8c782d9964 100644
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -25,6 +25,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/cleanupTable.inc';
 
 /**
@@ -130,8 +132,11 @@ class TitleCleanup extends TableCleanup {
 	 * @param object $row
 	 * @param Title $title
 	 */
-	protected function moveInconsistentPage( $row, $title ) {
-		if ( $title->exists() || $title->getInterwiki() || !$title->canExist() ) {
+	protected function moveInconsistentPage( $row, Title $title ) {
+		if ( $title->exists( Title::GAID_FOR_UPDATE )
+			|| $title->getInterwiki()
+			|| !$title->canExist()
+		) {
 			if ( $title->getInterwiki() || !$title->canExist() ) {
 				$prior = $title->getPrefixedDBkey();
 			} else {
@@ -160,7 +165,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();
@@ -179,10 +184,10 @@ class TitleCleanup extends TableCleanup {
 				],
 				[ 'page_id' => $row->page_id ],
 				__METHOD__ );
-			LinkCache::singleton()->clear();
+			MediaWikiServices::getInstance()->getLinkCache()->clear();
 		}
 	}
 }
 
-$maintClass = "TitleCleanup";
+$maintClass = TitleCleanup::class;
 require_once RUN_MAINTENANCE_IF_MAIN;