X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Frevisiondelete%2FRevisionDeleteUser.php;h=19fe0c3255a1c2ca127b5d047cb60723043c577c;hb=85fa38d0b71cae9a3065105b39d8c36dc6517285;hp=6291e8d91e03619f0f44c6967f5eb5b9ac7d1cec;hpb=4b2f95bed5a9ae0a917264abed2ba1fd9fb78f3c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/revisiondelete/RevisionDeleteUser.php b/includes/revisiondelete/RevisionDeleteUser.php
index 6291e8d91e..19fe0c3255 100644
--- a/includes/revisiondelete/RevisionDeleteUser.php
+++ b/includes/revisiondelete/RevisionDeleteUser.php
@@ -67,7 +67,7 @@ class RevisionDeleteUser {
 		$userTitle = Title::makeTitleSafe( NS_USER, $name );
 		$userDbKey = $userTitle->getDBkey();
 
-		if ( $wgActorTableSchemaMigrationStage < MIGRATION_NEW ) {
+		if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
 			# Hide name from live edits
 			$dbw->update(
 				'revision',
@@ -116,18 +116,21 @@ class RevisionDeleteUser {
 			);
 		}
 
-		if ( $wgActorTableSchemaMigrationStage > MIGRATION_OLD ) {
+		if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
 			$actorId = $dbw->selectField( 'actor', 'actor_id', [ 'actor_name' => $name ], __METHOD__ );
 			if ( $actorId ) {
 				# Hide name from live edits
-				$subquery = $dbw->selectSQLText(
+				$ids = $dbw->selectFieldValues(
 					'revision_actor_temp', 'revactor_rev', [ 'revactor_actor' => $actorId ], __METHOD__
 				);
-				$dbw->update(
-					'revision',
-					[ self::buildSetBitDeletedField( 'rev_deleted', $op, $delUser, $dbw ) ],
-					[ "rev_id IN ($subquery)" ],
-					__METHOD__ );
+				if ( $ids ) {
+					$dbw->update(
+						'revision',
+						[ self::buildSetBitDeletedField( 'rev_deleted', $op, $delUser, $dbw ) ],
+						[ 'rev_id' => $ids ],
+						__METHOD__
+					);
+				}
 
 				# Hide name from deleted edits
 				$dbw->update(