Merge "Re add wpScrolltop id in EditPage"

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

diff --git a/maintenance/cleanupTitles.php b/maintenance/cleanupTitles.php
index 650fae0..50e17d8 100644 (file)
--- a/maintenance/cleanupTitles.php
+++ b/maintenance/cleanupTitles.php
@@ -25,6 +25,8 @@
  * @ingroup Maintenance
  */
 
+use MediaWiki\MediaWikiServices;
+
 require_once __DIR__ . '/cleanupTable.inc';
 
 /**
@@ -130,22 +132,25 @@ 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 {
                                $prior = $title->getDBkey();
                        }
 
-                       # Old cleanupTitles could move articles there. See bug 23147.
+                       # Old cleanupTitles could move articles there. See T25147.
                        $ns = $row->page_namespace;
                        if ( $ns < 0 ) {
                                $ns = 0;
                        }
 
                        # Namespace which no longer exists. Put the page in the main namespace
-                       # since we don't have any idea of the old namespace name. See bug 68501.
+                       # since we don't have any idea of the old namespace name. See T70501.
                        if ( !MWNamespace::exists( $ns ) ) {
                                $ns = 0;
                        }
@@ -179,7 +184,7 @@ class TitleCleanup extends TableCleanup {
                                ],
                                [ 'page_id' => $row->page_id ],
                                __METHOD__ );
-                       LinkCache::singleton()->clear();
+                       MediaWikiServices::getInstance()->getLinkCache()->clear();
                }
        }
 }