X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FpopulateRevisionSha1.php;h=c06f1e85df433f266e6ff3dd9b924dbb18b0d0d0;hb=3657d0c1cc249d60c4244c1daa3c92da219f5bcc;hp=095c26693b2e4204a89bfa5f4b4a4a7210a645df;hpb=2a1fcd27c19913394c179cbe8be1a9e981d7f81b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php
index 095c26693b..c06f1e85df 100644
--- a/maintenance/populateRevisionSha1.php
+++ b/maintenance/populateRevisionSha1.php
@@ -55,10 +55,10 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 		}
 
 		$this->output( "Populating rev_sha1 column\n" );
-		$rc = $this->doSha1Updates( 'revision', 'rev_id', 'rev' );
+		$rc = $this->doSha1Updates( 'revision', 'rev_id', Revision::selectFields(), 'rev' );
 
 		$this->output( "Populating ar_sha1 column\n" );
-		$ac = $this->doSha1Updates( 'archive', 'ar_rev_id', 'ar' );
+		$ac = $this->doSha1Updates( 'archive', 'ar_rev_id', Revision::selectArchiveFields(), 'ar' );
 		$this->output( "Populating ar_sha1 column legacy rows\n" );
 		$ac += $this->doSha1LegacyUpdates();
 
@@ -74,7 +74,7 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 	 * @param string $prefix
 	 * @return int Rows changed
 	 */
-	protected function doSha1Updates( $table, $idCol, $prefix ) {
+	protected function doSha1Updates( $table, $idCol, $fields, $prefix ) {
 		$db = $this->getDB( DB_MASTER );
 		$start = $db->selectField( $table, "MIN($idCol)", false, __METHOD__ );
 		$end = $db->selectField( $table, "MAX($idCol)", false, __METHOD__ );
@@ -93,7 +93,7 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 			$this->output( "...doing $idCol from $blockStart to $blockEnd\n" );
 			$cond = "$idCol BETWEEN $blockStart AND $blockEnd
 				AND $idCol IS NOT NULL AND {$prefix}_sha1 = ''";
-			$res = $db->select( $table, '*', $cond, __METHOD__ );
+			$res = $db->select( $table, $fields, $cond, __METHOD__ );
 
 			$this->beginTransaction( $db, __METHOD__ );
 			foreach ( $res as $row ) {
@@ -117,7 +117,7 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 	protected function doSha1LegacyUpdates() {
 		$count = 0;
 		$db = $this->getDB( DB_MASTER );
-		$res = $db->select( 'archive', '*',
+		$res = $db->select( 'archive', Revision::selectArchiveFields(),
 			[ 'ar_rev_id IS NULL', 'ar_sha1' => '' ], __METHOD__ );
 
 		$updateSize = 0;
@@ -156,10 +156,10 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 		} catch ( Exception $e ) {
 			$this->output( "Data of revision with {$idCol}={$row->$idCol} unavailable!\n" );
 
-			return false; // bug 22624?
+			return false; // T24624?
 		}
 		if ( !is_string( $text ) ) {
-			# This should not happen, but sometimes does (bug 20757)
+			# This should not happen, but sometimes does (T22757)
 			$this->output( "Data of revision with {$idCol}={$row->$idCol} unavailable!\n" );
 
 			return false;
@@ -185,11 +185,11 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 		} catch ( Exception $e ) {
 			$this->output( "Text of revision with timestamp {$row->ar_timestamp} unavailable!\n" );
 
-			return false; // bug 22624?
+			return false; // T24624?
 		}
 		$text = $rev->getSerializedData();
 		if ( !is_string( $text ) ) {
-			# This should not happen, but sometimes does (bug 20757)
+			# This should not happen, but sometimes does (T22757)
 			$this->output( "Data of revision with timestamp {$row->ar_timestamp} unavailable!\n" );
 
 			return false;