Be sure that MW_NO_SETUP is defined before executing updates, this is not always...

diff --git a/config/Installer.php b/config/Installer.php
index 9d8855c..165740d 100644 (file)
--- a/config/Installer.php
+++ b/config/Installer.php
@@ -1234,7 +1234,6 @@ if( $conf->posted && ( 0 == count( $errs ) ) ) {
                        chdir( ".." );
                        flush();
 
-                       define( 'MW_NO_SETUP', true );
                        $updater = DatabaseUpdater::newForDb( $wgDatabase, false );
                        $updater->doUpdates();
                        foreach( $updater->getPostDatabaseUpdateMaintenance() as $maint ) {

diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 70bacfe..8a32808 100644 (file)
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -132,6 +132,10 @@ abstract class DatabaseUpdater {
        public function doUpdates( $purge = true ) {
                global $wgVersion;
 
+               if ( !defined( 'MW_NO_SETUP' ) ) {
+                       define( 'MW_NO_SETUP', true );
+               }
+
                $this->runUpdates( $this->getCoreUpdateList(), false );
                $this->runUpdates( $this->getOldGlobalUpdates(), false );
                $this->runUpdates( $this->getExtensionUpdates(), true );