X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmigrateActors.php;h=5e27ac8e8fd3c2d16915ef52744bb2984089daa3;hb=a2f8caa37193ccf63e88ead2269cb5d1880954f0;hp=5b144fc347bc35b6f22766f2b594f30b3ab01ba2;hpb=3bfcc2a9fe52f045206f465363ac1ba6a843ba69;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/migrateActors.php b/maintenance/migrateActors.php
index 5b144fc347..5e27ac8e8f 100644
--- a/maintenance/migrateActors.php
+++ b/maintenance/migrateActors.php
@@ -45,9 +45,9 @@ class MigrateActors extends LoggedUpdateMaintenance {
 	protected function doDBUpdates() {
 		global $wgActorTableSchemaMigrationStage;
 
-		if ( $wgActorTableSchemaMigrationStage < MIGRATION_WRITE_NEW ) {
+		if ( !( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) ) {
 			$this->output(
-				"...cannot update while \$wgActorTableSchemaMigrationStage < MIGRATION_WRITE_NEW\n"
+				"...cannot update while \$wgActorTableSchemaMigrationStage lacks SCHEMA_COMPAT_WRITE_NEW\n"
 			);
 			return false;
 		}
@@ -55,7 +55,7 @@ class MigrateActors extends LoggedUpdateMaintenance {
 		$this->output( "Creating actor entries for all registered users\n" );
 		$end = 0;
 		$dbw = $this->getDB( DB_MASTER );
-		$max = $dbw->selectField( 'user', 'MAX(user_id)', false, __METHOD__ );
+		$max = $dbw->selectField( 'user', 'MAX(user_id)', '', __METHOD__ );
 		$count = 0;
 		while ( $end < $max ) {
 			$start = $end + 1;
@@ -266,7 +266,6 @@ class MigrateActors extends LoggedUpdateMaintenance {
 					$table,
 					[
 						$actorField => $row->actor_id,
-						$nameField => '',
 					],
 					array_intersect_key( (array)$row, $pkFilter ) + [
 						$actorField => 0
@@ -377,7 +376,6 @@ class MigrateActors extends LoggedUpdateMaintenance {
 				}
 				$this->beginTransaction( $dbw, __METHOD__ );
 				$dbw->insert( $newTable, $inserts, __METHOD__ );
-				$dbw->update( $table, [ $nameField => '' ], [ $primaryKey => $updates ], __METHOD__ );
 				$countUpdated += $dbw->affectedRows();
 				$this->commitTransaction( $dbw, __METHOD__ );
 			}