From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 12 Aug 2011 19:24:08 +0000 (+0000)
Subject: More to r94370:
X-Git-Tag: 1.31.0-rc.0~28307
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=8991eea8fb2d85d6ca1ca43e5a101fdd45a887a8;p=lhc%2Fweb%2Fwiklou.git

More to r94370:
* Fixed hard-coded output message (use $table)
* Removed doPopulateRevSha1 from SqliteUpdater.php too (didn't notice someone added this)
---

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index f0a16634dc..0aeaf8df28 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -64,8 +64,7 @@ class SqliteUpdater extends DatabaseUpdater {
 			array( 'addTable', 'config',                            'patch-config.sql' ),
 			array( 'addIndex', 'logging',       'type_action',      'patch-logging-type-action-index.sql'),
 			array( 'addField', 'revision',      'rev_sha1',         'patch-rev_sha1.sql' ),
-			array( 'addField', 'archive',       'ar_sha1',          'patch-ar_sha1.sql' ),
-			array( 'doPopulateRevSha1' ),
+			array( 'addField', 'archive',       'ar_sha1',          'patch-ar_sha1.sql' )
 		);
 	}
 
diff --git a/maintenance/populateRevisionSha1.php b/maintenance/populateRevisionSha1.php
index 6e11b2efea..6e5c3bfc7b 100644
--- a/maintenance/populateRevisionSha1.php
+++ b/maintenance/populateRevisionSha1.php
@@ -68,7 +68,7 @@ class PopulateRevisionSha1 extends LoggedUpdateMaintenance {
 		$start = $db->selectField( $table, "MIN($idCol)", false, __METHOD__ );
 		$end = $db->selectField( $table, "MAX($idCol)", false, __METHOD__ );
 		if ( !$start || !$end ) {
-			$this->output( "...revision table seems to be empty.\n" );
+			$this->output( "...$table table seems to be empty.\n" );
 			return true;
 		}