http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72873

Revision: 72873
Author:   ialex
Date:     2010-09-12 17:13:06 +0000 (Sun, 12 Sep 2010)

Log Message:
-----------
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 ;)

Modified Paths:
--------------
    trunk/phase3/config/Installer.php
    trunk/phase3/config/new-index.php

Modified: trunk/phase3/config/Installer.php
===================================================================
--- trunk/phase3/config/Installer.php   2010-09-12 16:48:03 UTC (rev 72872)
+++ trunk/phase3/config/Installer.php   2010-09-12 17:13:06 UTC (rev 72873)
@@ -277,9 +277,6 @@
        <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 @@
                        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";

Modified: trunk/phase3/config/new-index.php
===================================================================
--- trunk/phase3/config/new-index.php   2010-09-12 16:48:03 UTC (rev 72872)
+++ trunk/phase3/config/new-index.php   2010-09-12 17:13:06 UTC (rev 72873)
@@ -9,7 +9,6 @@
 
 chdir( ".." );
 require( './includes/WebStart.php' );
-require_once( './maintenance/updaters.inc' ); // sigh...
 
 $installer = new WebInstaller( $wgRequest );
 



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to