Update to MediaWiki 1.20.2

this update includes:
* adjusted Arch Linux skin
* updated FluxBBAuthPlugin
* patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024

1 files changed, 18 insertions, 4 deletions

diff --git a/maintenance/migrateUserGroup.php b/maintenance/migrateUserGroup.php
index 771ed947..496af723 100644
--- a/maintenance/migrateUserGroup.php
+++ b/maintenance/migrateUserGroup.php
@@ -17,11 +17,17 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @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.
+ *
+ * @ingroup Maintenance
+ */
 class MigrateUserGroup extends Maintenance {
 	public function __construct() {
 		parent::__construct();
@@ -50,14 +56,22 @@ class MigrateUserGroup extends Maintenance {
 		// Migrate users over in batches...
 		while ( $blockEnd <= $end ) {
 			$this->output( "Doing users $blockStart to $blockEnd\n" );
-			$dbw->begin();
+			$dbw->begin( __METHOD__ );
 			$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();
+			$dbw->commit( __METHOD__ );
 			$blockStart += $this->mBatchSize;
 			$blockEnd += $this->mBatchSize;
 			wfWaitForSlaves();