X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=maintenance%2FdeleteDefaultMessages.php;h=326073f1a28ed33f2a510871b6e988773548d380;hb=8269ed4dfd5e4395e25945b1fa2ed391684606ed;hp=ba8662ac2e253b2d4f976ab38e45d39102c1a484;hpb=f4a53c54065c385172363416eb3cb44b67585ca2;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/deleteDefaultMessages.php b/maintenance/deleteDefaultMessages.php
index ba8662ac2e..326073f1a2 100644
--- a/maintenance/deleteDefaultMessages.php
+++ b/maintenance/deleteDefaultMessages.php
@@ -43,13 +43,19 @@ class DeleteDefaultMessages extends Maintenance {
 
 		$this->output( "Checking existence of old default messages..." );
 		$dbr = $this->getDB( DB_REPLICA );
-		$res = $dbr->select( [ 'page', 'revision' ],
+
+		$actorQuery = ActorMigration::newMigration()
+			->getWhere( $dbr, 'rev_user', User::newFromName( 'MediaWiki default' ) );
+		$res = $dbr->select(
+			[ 'page', 'revision' ] + $actorQuery['tables'],
 			[ 'page_namespace', 'page_title' ],
 			[
 				'page_namespace' => NS_MEDIAWIKI,
-				'page_latest=rev_id',
-				'rev_user_text' => 'MediaWiki default',
-			]
+				$actorQuery['conds'],
+			],
+			__METHOD__,
+			[],
+			[ 'revision' => [ 'JOIN', 'page_latest=rev_id' ] ] + $actorQuery['joins']
 		);
 
 		if ( $dbr->numRows( $res ) == 0 ) {
@@ -72,7 +78,7 @@ class DeleteDefaultMessages extends Maintenance {
 		// in order to hide it in RecentChanges.
 		$user = User::newFromName( 'MediaWiki default' );
 		if ( !$user ) {
-			$this->error( "Invalid username", true );
+			$this->fatalError( "Invalid username" );
 		}
 		$user->addGroup( 'bot' );
 		$wgUser = $user;
@@ -95,5 +101,5 @@ class DeleteDefaultMessages extends Maintenance {
 	}
 }
 
-$maintClass = "DeleteDefaultMessages";
+$maintClass = DeleteDefaultMessages::class;
 require_once RUN_MAINTENANCE_IF_MAIN;