X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateLogUsertext.php;h=2fe7ea631114de7710b939d1001a4ca8103be8e4;hb=3f59cb9f3a53ad28f8a95fe299c5de6abd24b453;hp=dd120fe0035ad4fbe93f2d6e599676d5a1275793;hpb=9ba3fca2d8adc56787c8efc32c41424cb212e387;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateLogUsertext.php b/maintenance/populateLogUsertext.php
index dd120fe003..2fe7ea6311 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,12 +59,13 @@ 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";
+			$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__ );
 
@@ -73,8 +75,8 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance {
 					[ '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" );
@@ -83,5 +85,5 @@ class PopulateLogUsertext extends LoggedUpdateMaintenance {
 	}
 }
 
-$maintClass = "PopulateLogUsertext";
+$maintClass = PopulateLogUsertext::class;
 require_once RUN_MAINTENANCE_IF_MAIN;