X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FreassignEdits.php;h=bb34e51c7bf3e0d171c8d8e89a029a1efbc10e19;hb=d227c81644a1979f0874b5d598008c197877ba02;hp=0613c7596d43b584cbb4ae27232b8ea3013f15ae;hpb=659778619cc12d156d3547834c0f90f407584104;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/reassignEdits.php b/maintenance/reassignEdits.php
index 0613c7596d..bb34e51c7b 100644
--- a/maintenance/reassignEdits.php
+++ b/maintenance/reassignEdits.php
@@ -34,21 +34,22 @@ class ReassignEdits extends Maintenance {
 		$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 ) );
-	
+
 			# If the target doesn't exist, and --force is not set, stop here
 			if ( $to->getId() || $this->hasOption( 'force' ) ) {
 				# Reassign the edits
 				$report = $this->hasOption( 'report' );
-				$count = $this->doReassignEdits( $from, $to, !$this->hasOption( 'norc' ), $report );
-				# If reporting, and there were items, advise the user to run without --report	
-				if ( $report )
+				$this->doReassignEdits( $from, $to, !$this->hasOption( 'norc' ), $report );
+				# If reporting, and there were items, advise the user to run without --report
+				if ( $report ) {
 					$this->output( "Run the script again without --report to update.\n" );
+				}
 			} else {
 				$ton = $to->getName();
 				$this->error( "User '{$ton}' not found." );
@@ -92,44 +93,47 @@ class ReassignEdits extends Maintenance {
 		} else {
 			$rec = 0;
 		}
-	
+
 		$total = $cur + $del + $rec;
 		$this->output( "\nTotal entries to change: {$total}\n" );
-	
+
 		if ( !$report ) {
 			if ( $total ) {
 				# Reassign edits
 				$this->output( "\nReassigning current edits..." );
-				$res = $dbw->update( 'revision', $this->userSpecification( $to, 'rev_user', 'rev_user_text' ), $this->userConditions( $from, 'rev_user', 'rev_user_text' ), __METHOD__ );
+				$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', $this->userSpecification( $to, 'ar_user', 'ar_user_text' ), $this->userConditions( $from, 'ar_user', 'ar_user_text' ), __METHOD__ );
+				$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 ) {
 					$this->output( "Updating recent changes..." );
-					$res = $dbw->update( 'recentchanges', $this->userSpecification( $to, 'rc_user', 'rc_user_text' ), $this->userConditions( $from, 'rc_user', 'rc_user_text' ), __METHOD__ );
+					$dbw->update( 'recentchanges', $this->userSpecification( $to, 'rc_user', 'rc_user_text' ),
+						$this->userConditions( $from, 'rc_user', 'rc_user_text' ), __METHOD__ );
 					$this->output( "done.\n" );
 				}
 			}
 		}
-	
+
 		$dbw->commit();
 		return (int)$total;
 	}
-	
+
 	/**
 	 * Return the most efficient set of user conditions
 	 * i.e. a user => id mapping, or a user_text => text mapping
 	 *
 	 * @param $user User for the condition
-	 * @param $idfield Field name containing the identifier
-	 * @param $utfield Field name containing the user text
+	 * @param $idfield string Field name containing the identifier
+	 * @param $utfield string Field name containing the user text
 	 * @return array
 	 */
 	private function userConditions( &$user, $idfield, $utfield ) {
 		return $user->getId() ? array( $idfield => $user->getId() ) : array( $utfield => $user->getName() );
 	}
-	
+
 	/**
 	 * Return user specifications
 	 * i.e. user => id, user_text => text
@@ -142,7 +146,7 @@ class ReassignEdits extends Maintenance {
 	private function userSpecification( &$user, $idfield, $utfield ) {
 		return array( $idfield => $user->getId(), $utfield => $user->getName() );
 	}
-	
+
 	/**
 	 * Initialise the user object
 	 *
@@ -165,5 +169,5 @@ class ReassignEdits extends Maintenance {
 }
 
 $maintClass = "ReassignEdits";
-require_once( DO_MAINTENANCE );
+require_once( RUN_MAINTENANCE_IF_MAIN );