From: Sam Reed <reedy@users.mediawiki.org>
Date: Wed, 28 Sep 2011 18:19:57 +0000 (+0000)
Subject: Followup r98339
X-Git-Tag: 1.31.0-rc.0~27388
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=f776a7ed688ca34e855f200af65b427ee84f5473;p=lhc%2Fweb%2Fwiklou.git

Followup r98339

Add RELEASE-NOTES-1.19

Fix runChild in DatabaseUpdater.php
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index a52d4dae3b..0a01acd72b 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -14,6 +14,7 @@ production.
 * Removed SkinTemplateSetupPageCss hook; use BeforePageDisplay instead.
 * (bug 27132) movefile right granted by default to registered users.
 * Default cookie lifetime ($wgCookieExpiration) is increased to 180 days.
+* (bug 31204) Removed old user.user_options
 
 === New features in 1.19 ===
 * (bug 30497) Add client-nojs and client-js classes on document element
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 4f427badc3..595b1e265b 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -568,7 +568,7 @@ abstract class DatabaseUpdater {
 	}
 
 	protected function doMigrateUserOptions() {
-		$cl = $this->maintenance->runChild( 'ConvertUserOptions' );
+		$cl = $this->maintenance->runChild( 'ConvertUserOptions', 'convertUserOptions.php' );
 		$this->output( "Migrating remaining user_options... " );
 		$cl->execute();
 		$this->output( "done.\n" );