X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FmigrateUserGroup.php;h=bf8d071ce8ecb0ee88c044e404258a64b4ba999d;hb=339adab63a1e6016446743f2003d42fbfc1fbace;hp=ad82542fb56fba8b306e5a232a89d8a30c8cc1cd;hpb=f5baf27bb89a4306e77e7ad1183791f775888199;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index ad82542fb5..bf8d071ce8 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -48,7 +48,7 @@ class MigrateUserGroup extends Maintenance {
 		$end = $dbw->selectField( 'user_groups', 'MAX(ug_user)',
 			[ 'ug_group' => $oldGroup ], __FUNCTION__ );
 		if ( $start === null ) {
-			$this->error( "Nothing to do - no users in the '$oldGroup' group", true );
+			$this->fatalError( "Nothing to do - no users in the '$oldGroup' group" );
 		}
 		# Do remaining chunk
 		$end += $batchSize - 1;
@@ -63,7 +63,7 @@ class MigrateUserGroup extends Maintenance {
 			$dbw->update( 'user_groups',
 				[ 'ug_group' => $newGroup ],
 				[ 'ug_group' => $oldGroup,
-					"ug_user BETWEEN $blockStart AND $blockEnd" ],
+					"ug_user BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ],
 				__METHOD__,
 				[ 'IGNORE' ]
 			);
@@ -74,7 +74,7 @@ class MigrateUserGroup extends Maintenance {
 			// user/group is UNIQUE.
 			$dbw->delete( 'user_groups',
 				[ 'ug_group' => $oldGroup,
-					"ug_user BETWEEN $blockStart AND $blockEnd" ],
+					"ug_user BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ],
 				__METHOD__
 			);
 			$affected += $dbw->affectedRows();
@@ -86,7 +86,7 @@ class MigrateUserGroup extends Maintenance {
 				// were in the new group and not in the group.
 				$res = $dbw->select( 'user_groups', 'ug_user',
 					[ 'ug_group' => $newGroup,
-						"ug_user BETWEEN $blockStart AND $blockEnd" ],
+						"ug_user BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd ],
 					__METHOD__
 				);
 				if ( $res !== false ) {
@@ -100,11 +100,10 @@ class MigrateUserGroup extends Maintenance {
 			$count += $affected;
 			$blockStart += $batchSize;
 			$blockEnd += $batchSize;
-			wfWaitForSlaves();
 		}
 		$this->output( "Done! $count users in group '$oldGroup' are now in '$newGroup' instead.\n" );
 	}
 }
 
-$maintClass = "MigrateUserGroup";
+$maintClass = MigrateUserGroup::class;
 require_once RUN_MAINTENANCE_IF_MAIN;