Followup r102799, unconditionally running them anyway also isn't much use

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 6a6c23f..ba51beb 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -570,10 +570,11 @@ abstract class DatabaseUpdater {
                        "Populating log_user_text field, printing progress markers. For large\n" .
                        "databases, you may want to hit Ctrl-C and do this manually with\n" .
                        "maintenance/populateLogUsertext.php.\n" );
+
+                       $task = $this->maintenance->runChild( 'PopulateLogUsertext' );
+                       $task->execute();
+                       $this->insertUpdateRow( 'populate log_usertext' );
                }
-               $task = $this->maintenance->runChild( 'PopulateLogUsertext' );
-               $task->execute();
-               $this->insertUpdateRow( 'populate log_usertext' );
        }
 
        protected function doLogSearchPopulation() {
@@ -582,10 +583,11 @@ abstract class DatabaseUpdater {
                                "Populating log_search table, printing progress markers. For large\n" .
                                "databases, you may want to hit Ctrl-C and do this manually with\n" .
                                "maintenance/populateLogSearch.php.\n" );
+
+                       $task = $this->maintenance->runChild( 'PopulateLogSearch' );
+                       $task->execute();
+                       $this->insertUpdateRow( 'populate log_search' );
                }
-               $task = $this->maintenance->runChild( 'PopulateLogSearch' );
-               $task->execute();
-               $this->insertUpdateRow( 'populate log_search' );
        }
 
        protected function doUpdateTranscacheField() {

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index a037e9d..286f144 100644 (file)
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -755,10 +755,11 @@ class MysqlUpdater extends DatabaseUpdater {
                                "Populating rev_parent_id fields, printing progress markers. For large\n" .
                                "databases, you may want to hit Ctrl-C and do this manually with\n" .
                                "maintenance/populateParentId.php.\n" );
+
+                       $task = $this->maintenance->runChild( 'PopulateParentId' );
+                       $task->execute();
+                       $this->insertUpdateRow( 'populate rev_parent_id' );
                }
-               $task = $this->maintenance->runChild( 'PopulateParentId' );
-               $task->execute();
-               $this->insertUpdateRow( 'populate rev_parent_id' );
        }
 
        protected function doMaybeProfilingMemoryUpdate() {