X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateLogUsertext.php;h=6e8261a6125998f8fa1772bc373c268b2de8fce9;hb=fdb7d369035d0826113f9d8b6c3e99a9bba073be;hp=ec3c4722cb201d2744da8dc076bae4b23b710da9;hpb=74174fca253b9a759d7402f09b7fc37d5de0e9be;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index ec3c4722cb..6e8261a612 100644
--- a/maintenance/populateLogUsertext.php
+++ b/maintenance/populateLogUsertext.php
@@ -48,6 +48,7 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance {
 	}
 
 	protected function doDBUpdates() {
+		$batchSize = $this->getBatchSize();
 		$db = $this->getDB( DB_MASTER );
 		$start = $db->selectField( 'logging', 'MIN(log_id)', false, __METHOD__ );
 		if ( !$start ) {
@@ -58,23 +59,24 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance {
 		$end = $db->selectField( 'logging', 'MAX(log_id)', false, __METHOD__ );
 
 		# Do remaining chunk
-		$end += $this->mBatchSize - 1;
+		$end += $batchSize - 1;
 		$blockStart = $start;
-		$blockEnd = $start + $this->mBatchSize - 1;
+		$blockEnd = $start + $batchSize - 1;
 		while ( $blockEnd <= $end ) {
 			$this->output( "...doing log_id from $blockStart to $blockEnd\n" );
-			$cond = "log_id BETWEEN $blockStart AND $blockEnd AND log_user = user_id";
-			$res = $db->select( array( 'logging', 'user' ),
-				array( 'log_id', 'user_name' ), $cond, __METHOD__ );
+			$cond = "log_id BETWEEN " . (int)$blockStart . " AND " . (int)$blockEnd .
+				" AND log_user = user_id";
+			$res = $db->select( [ 'logging', 'user' ],
+				[ 'log_id', 'user_name' ], $cond, __METHOD__ );
 
 			$this->beginTransaction( $db, __METHOD__ );
 			foreach ( $res as $row ) {
-				$db->update( 'logging', array( 'log_user_text' => $row->user_name ),
-					array( 'log_id' => $row->log_id ), __METHOD__ );
+				$db->update( 'logging', [ 'log_user_text' => $row->user_name ],
+					[ 'log_id' => $row->log_id ], __METHOD__ );
 			}
 			$this->commitTransaction( $db, __METHOD__ );
-			$blockStart += $this->mBatchSize;
-			$blockEnd += $this->mBatchSize;
+			$blockStart += $batchSize;
+			$blockEnd += $batchSize;
 			wfWaitForSlaves();
 		}
 		$this->output( "Done populating log_user_text field.\n" );