Revert r114067, r114071, r114075, r114079, r114081, r114082, r114084, r114086, r11408...

[lhc/web/wiklou.git] / maintenance / moveBatch.php

diff --git a/maintenance/moveBatch.php b/maintenance/moveBatch.php
index 9b9f910..a7739c2 100644 (file)
--- a/maintenance/moveBatch.php
+++ b/maintenance/moveBatch.php
@@ -67,6 +67,9 @@ class MoveBatch extends Maintenance {
                        $this->error( "Unable to read file, exiting", true );
                }
                $wgUser = User::newFromName( $user );
+               if ( !$wgUser ) {
+                       $this->error( "Invalid username", true );
+               }
 
                # Setup complete, now start
                $dbw = wfGetDB( DB_MASTER );
@@ -89,13 +92,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] ) );
                        }
-                       $dbw->commit();
+                       $dbw->commit( __METHOD__ );
                        $this->output( "\n" );
 
                        if ( $interval ) {