X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=maintenance%2FmigrateUserGroup.php;h=496af7237b8b449fec4638427506d4c0aa98a11e;hb=523d7f037e5e8b31fcd9d1a376ab1a36a45d5df2;hp=451b598be9c04d01d55045e7968730f7af1d7e0a;hpb=ef5d00345fbba4f77ffaf1e9cbf5ca232159a66d;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 451b598be9..496af7237b 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -21,7 +21,7 @@
  * @ingroup Maintenance
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
 /**
  * Maintenance script that re-assigns users from an old group to a new one.
@@ -60,7 +60,15 @@ class MigrateUserGroup extends Maintenance {
 			$dbw->update( 'user_groups',
 				array( 'ug_group' => $newGroup ),
 				array( 'ug_group' => $oldGroup,
-					"ug_user BETWEEN $blockStart AND $blockEnd" )
+					"ug_user BETWEEN $blockStart AND $blockEnd" ),
+				__METHOD__,
+				array( 'IGNORE' )
+			);
+			$count += $dbw->affectedRows();
+			$dbw->delete( 'user_groups',
+				array( 'ug_group' => $oldGroup,
+					"ug_user BETWEEN $blockStart AND $blockEnd" ),
+				__METHOD__
 			);
 			$count += $dbw->affectedRows();
 			$dbw->commit( __METHOD__ );