Follow-up r62648: Add new message key to maintenance script

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

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 926ee5c..e595e5b 100644 (file)
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -31,14 +31,15 @@ class ReassignEdits extends Maintenance {
                $this->addOption( "force", "Reassign even if the target user doesn't exist" );
                $this->addOption( "norc", "Don't update the recent changes table" );
                $this->addOption( "report", "Print out details of what would be changed, but don't update it" );
-               $this->addArgs( array( 'from', 'to' ) );
+               $this->addArg( 'from', 'Old user to take edits from' );
+               $this->addArg( 'to', 'New user to give edits to' );
        }
        
        public function execute() {
                if( $this->hasArg(0) && $this->hasArg(1) ) {
                        # Set up the users involved
-                       $from =& $this->initialiseUser( $this->getArg(0) );
-                       $to   =& $this->initialiseUser( $this->getArg(1) );
+                       $from = $this->initialiseUser( $this->getArg(0) );
+                       $to   = $this->initialiseUser( $this->getArg(1) );
        
                        # If the target doesn't exist, and --force is not set, stop here
                        if( $to->getId() || $this->hasOption('force') ) {
@@ -66,7 +67,7 @@ class ReassignEdits extends Maintenance {
         */
        private function doReassignEdits( &$from, &$to, $rc = false, $report = false ) {
                $dbw = wfGetDB( DB_MASTER );
-               $dbw->immediateBegin();
+               $dbw->begin();
 
                # Count things
                $this->output( "Checking current edits..." );
@@ -99,9 +100,9 @@ class ReassignEdits extends Maintenance {
                        if( $total ) {
                                # Reassign edits
                                $this->output( "\nReassigning current edits..." );
-                               $res = $dbw->update( 'revision', userSpecification( $to, 'rev_user', 'rev_user_text' ), $this->userConditions( $from, 'rev_user', 'rev_user_text' ), __METHOD__ );
+                               $res = $dbw->update( 'revision', $this->userSpecification( $to, 'rev_user', 'rev_user_text' ), $this->userConditions( $from, 'rev_user', 'rev_user_text' ), __METHOD__ );
                                $this->output( "done.\nReassigning deleted edits..." );
-                               $res = $dbw->update( 'archive', userSpecification( $to, 'ar_user', 'ar_user_text' ), $this->userConditions( $from, 'ar_user', 'ar_user_text' ), __METHOD__ );
+                               $res = $dbw->update( 'archive', $this->userSpecification( $to, 'ar_user', 'ar_user_text' ), $this->userConditions( $from, 'ar_user', 'ar_user_text' ), __METHOD__ );
                                $this->output( "done.\n" );
                                # Update recent changes if required
                                if( $rc ) {
@@ -112,7 +113,7 @@ class ReassignEdits extends Maintenance {
                        }       
                }
        
-               $dbw->immediateCommit();
+               $dbw->commit();
                return (int)$total;     
        }