From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 18 Jan 2013 16:46:04 +0100
Subject: 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
---
 maintenance/moveBatch.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'maintenance/moveBatch.php')

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 6ecc775e..7d15959c 100644
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Maintenance script to move a batch of pages
+ * Move a batch of pages.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  * http://www.gnu.org/copyleft/gpl.html
  *
+ * @file
  * @ingroup Maintenance
  * @author Tim Starling
  *
@@ -33,8 +34,13 @@
  * e.g. immobile_namespace for namespaces which can't be moved
  */
 
-require_once( dirname( __FILE__ ) . '/Maintenance.php' );
+require_once( __DIR__ . '/Maintenance.php' );
 
+/**
+ * Maintenance script to move a batch of pages.
+ *
+ * @ingroup Maintenance
+ */
 class MoveBatch extends Maintenance {
 	public function __construct() {
 		parent::__construct();
@@ -92,13 +98,13 @@ class MoveBatch extends Maintenance {
 
 
 			$this->output( $source->getPrefixedText() . ' --> ' . $dest->getPrefixedText() );
-			$dbw->begin();
+			$dbw->begin( __METHOD__ );
 			$err = $source->moveTo( $dest, false, $reason );
 			if ( $err !== true ) {
 				$msg = array_shift( $err[0] );
-				$this->output( "\nFAILED: " . wfMsg( $msg, $err[0] ) );
+				$this->output( "\nFAILED: " . wfMessage( $msg, $err[0] )->text() );
 			}
-			$dbw->commit();
+			$dbw->commit( __METHOD__ );
 			$this->output( "\n" );
 
 			if ( $interval ) {
-- 
cgit v1.2.2