From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Thu, 1 Oct 2009 14:45:16 +0000 (+0000)
Subject: * (bug 20908) reassignEdits.php was calling userSpecification() which was moved to... 
X-Git-Tag: 1.31.0-rc.0~39432
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=d71ff05763e59f1277afe6793a08acc76e68cc88;p=lhc%2Fweb%2Fwiklou.git

* (bug 20908) reassignEdits.php was calling userSpecification() which was moved to the ReassignEdits class with the maintenance scripts rewrite
* Also fix some E_STRICT errors
---

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 0ce08cc35e..296e7e10bc 100644
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -38,8 +38,8 @@ class ReassignEdits extends Maintenance {
 	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') ) {
@@ -100,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 ) {