From b1a89e0875469e2f47f466df5b305158c30f89b1 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 11 Nov 2011 16:58:09 +0000
Subject: [PATCH] Followup r102799, unconditionally running them anyway also
 isn't much use

---
 includes/installer/DatabaseUpdater.php | 14 ++++++++------
 includes/installer/MysqlUpdater.php    |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 6a6c23f76d..ba51beb76e 100644
--- 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 a037e9dba2..286f144139 100644
--- 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() {
-- 
2.20.1