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 f0a1663..0aeaf8d 100644 (file)
--- 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 6e11b2e..6e5c3bf 100644 (file)
--- 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;
                }