X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FreassignEdits.php;h=98025d1d90eb5ab70ae3400fa1bb077a49cbeca3;hb=f51c9e889f24091d3e20488530c1f80900059868;hp=44589016afeb063924d0e6a42b6e5ca6cd647592;hpb=e2f61aa44095d56af0d4b25a59e25b55a6c297bc;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 44589016af..98025d1d90 100644
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -20,7 +20,7 @@
  * @file
  * @ingroup Maintenance
  * @author Rob Church <robchur@gmail.com>
- * @license GNU General Public Licence 2.0 or later
+ * @license GPL-2.0-or-later
  */
 
 use Wikimedia\Rdbms\IDatabase;
@@ -136,20 +136,19 @@ class ReassignEdits extends Maintenance {
 			if ( $total ) {
 				# Reassign edits
 				$this->output( "\nReassigning current edits..." );
-				if ( $wgActorTableSchemaMigrationStage < MIGRATION_NEW ) {
+				if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
 					$dbw->update(
 						'revision',
 						[
 							'rev_user' => $to->getId(),
-							'rev_user_text' =>
-								$wgActorTableSchemaMigrationStage <= MIGRATION_WRITE_BOTH ? $to->getName() : ''
+							'rev_user_text' => $to->getName(),
 						],
 						$from->isLoggedIn()
 							? [ 'rev_user' => $from->getId() ] : [ 'rev_user_text' => $from->getName() ],
 						__METHOD__
 					);
 				}
-				if ( $wgActorTableSchemaMigrationStage > MIGRATION_OLD ) {
+				if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
 					$dbw->update(
 						'revision_actor_temp',
 						[ 'revactor_actor' => $to->getActorId( $dbw ) ],
@@ -179,7 +178,7 @@ class ReassignEdits extends Maintenance {
 	}
 
 	/**
-	 * Return user specifications
+	 * Return user specifications for an UPDATE
 	 * i.e. user => id, user_text => text
 	 *
 	 * @param IDatabase $dbw Database handle
@@ -193,13 +192,13 @@ class ReassignEdits extends Maintenance {
 		global $wgActorTableSchemaMigrationStage;
 
 		$ret = [];
-		if ( $wgActorTableSchemaMigrationStage < MIGRATION_NEW ) {
+		if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_OLD ) {
 			$ret += [
 				$idfield => $user->getId(),
-				$utfield => $wgActorTableSchemaMigrationStage <= MIGRATION_WRITE_BOTH ? $user->getName() : '',
+				$utfield => $user->getName(),
 			];
 		}
-		if ( $wgActorTableSchemaMigrationStage > MIGRATION_OLD ) {
+		if ( $wgActorTableSchemaMigrationStage & SCHEMA_COMPAT_WRITE_NEW ) {
 			$ret += [ $acfield => $user->getActorId( $dbw ) ];
 		}
 		return $ret;