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

Revision: 74108
Author:   ialex
Date:     2010-10-01 20:56:39 +0000 (Fri, 01 Oct 2010)

Log Message:
-----------
Be sure that MW_NO_SETUP is defined before executing updates, this is not 
always defined at that point

Modified Paths:
--------------
    trunk/phase3/config/Installer.php
    trunk/phase3/includes/installer/DatabaseUpdater.php

Modified: trunk/phase3/config/Installer.php
===================================================================
--- trunk/phase3/config/Installer.php   2010-10-01 20:46:42 UTC (rev 74107)
+++ trunk/phase3/config/Installer.php   2010-10-01 20:56:39 UTC (rev 74108)
@@ -1234,7 +1234,6 @@
                        chdir( ".." );
                        flush();
 
-                       define( 'MW_NO_SETUP', true );
                        $updater = DatabaseUpdater::newForDb( $wgDatabase, 
false );
                        $updater->doUpdates();
                        foreach( $updater->getPostDatabaseUpdateMaintenance() 
as $maint ) {

Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-10-01 20:46:42 UTC 
(rev 74107)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-10-01 20:56:39 UTC 
(rev 74108)
@@ -132,6 +132,10 @@
        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 );



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

Reply via email to