Fix for r72870: seems I didn't see that updaters.inc was included in the config direc...

diff --git a/config/Installer.php b/config/Installer.php
index 17332f3..9d8855c 100644 (file)
--- 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 faf8886..fa7ec60 100644 (file)
--- 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 );