Merge "SpecialStatistics::getOtherStats use standard language instead of inContentLan...

[lhc/web/wiklou.git] / maintenance / doMaintenance.php

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index f470aed..f471d50 100644 (file)
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -34,7 +34,7 @@ if ( !defined( 'RUN_MAINTENANCE_IF_MAIN' ) ) {
 // Wasn't included from the file scope, halt execution (probably wanted the class)
 // If a class is using commandLine.inc (old school maintenance), they definitely
 // cannot be included and will proceed with execution
-if( !Maintenance::shouldExecute() && $maintClass != 'CommandLineInc' ) {
+if ( !Maintenance::shouldExecute() && $maintClass != 'CommandLineInc' ) {
        return;
 }
 
@@ -54,21 +54,20 @@ $maintenance->setup();
 $self = $maintenance->getName();
 
 // Detect compiled mode
-if ( isset( $_SERVER['MW_COMPILED'] ) ) {
-       define( 'MW_COMPILED', 1 );
-} else {
-       # Get the MWInit class
-       require_once( "$IP/includes/Init.php" );
-       require_once( "$IP/includes/AutoLoader.php" );
-}
-
+# Get the MWInit class
+require_once( "$IP/includes/Init.php" );
+require_once( "$IP/includes/AutoLoader.php" );
 # Stub the profiler
-require_once( MWInit::compiledPath( 'includes/profiler/Profiler.php' ) );
+require_once( "$IP/includes/profiler/Profiler.php" );
 
-// Some other requires
-if ( !defined( 'MW_COMPILED' ) ) {
-       require_once( "$IP/includes/Defines.php" );
+# Start the profiler
+$wgProfiler = array();
+if ( file_exists( "$IP/StartProfiler.php" ) ) {
+       require( "$IP/StartProfiler.php" );
 }
+
+// Some other requires
+require_once( "$IP/includes/Defines.php" );
 require_once( MWInit::compiledPath( 'includes/DefaultSettings.php' ) );
 
 if ( defined( 'MW_CONFIG_CALLBACK' ) ) {
@@ -95,8 +94,9 @@ if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
 }
 
 if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
-       if ( $wgLocalisationCacheConf['storeClass'] === false && ( $wgLocalisationCacheConf['store'] == 'db' || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) ) )
+       if ( $wgLocalisationCacheConf['storeClass'] === false && ( $wgLocalisationCacheConf['store'] == 'db' || ( $wgLocalisationCacheConf['store'] == 'detect' && !$wgCacheDirectory ) ) ) {
                $wgLocalisationCacheConf['storeClass'] = 'LCStore_Null';
+       }
 }
 $maintenance->finalSetup();
 // Some last includes
@@ -112,9 +112,17 @@ try {
        // Potentially debug globals
        $maintenance->globals();
 
+       // Perform deferred updates.
+       DeferredUpdates::doUpdates( 'commit' );
+
        // log profiling info
        wfLogProfilingData();
+
+       // Commit and close up!
+       $factory = wfGetLBFactory();
+       $factory->commitMasterChanges();
+       $factory->shutdown();
 } catch ( MWException $mwe ) {
-       echo( $mwe->getText() );
+       echo $mwe->getText();
        exit( 1 );
 }