From 2e249fcc7b24f361eed3a50b23cc1400a0489c02 Mon Sep 17 00:00:00 2001
From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sun, 12 Sep 2010 17:13:06 +0000
Subject: [PATCH] Fix for r72870: seems I didn't see that updaters.inc was
 included in the config directory, same for ^demon when he removed
 do_all_updates() in r72539 ;)

---
 config/Installer.php | 12 ++++++++----
 config/new-index.php |  1 -
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/config/Installer.php b/config/Installer.php
index 17332f3420..9d8855cb42 100644
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -277,9 +277,6 @@ if( !is_writable( "." ) ) {
 	<p>Afterwards retry to start the <a href=\"\">setup</a>.</p>" );
 }
 
-
-require_once( "$IP/maintenance/updaters.inc" );
-
 class ConfigData {
 	function getEncoded( $data ) {
 		# removing latin1 support, no need...
@@ -1236,7 +1233,14 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
 			print "</ul><pre>\n";
 			chdir( ".." );
 			flush();
-			do_all_updates();
+
+			define( 'MW_NO_SETUP', true );
+			$updater = DatabaseUpdater::newForDb( $wgDatabase, false );
+			$updater->doUpdates();
+			foreach( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {
+				call_user_func_array( array( new $maint, 'execute' ), array() );
+			}
+
 			chdir( "config" );
 			print "</pre>\n";
 			print "<ul><li>Finished update checks.</li>\n";
diff --git a/config/new-index.php b/config/new-index.php
index faf8886f96..fa7ec60f6d 100644
--- a/config/new-index.php
+++ b/config/new-index.php
@@ -9,7 +9,6 @@ define( 'MW_CONFIG_CALLBACK', 'CoreInstaller::overrideConfig' );
 
 chdir( ".." );
 require( './includes/WebStart.php' );
-require_once( './maintenance/updaters.inc' ); // sigh...
 
 $installer = new WebInstaller( $wgRequest );
 
-- 
2.20.1