X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=blobdiff_plain;f=maintenance%2FdoMaintenance.php;h=53a317a7c2447a9f763f42c16793af98322100b2;hb=21948ec459cbb99167c09b59b7296b7f5d502aa0;hp=f3561b5538004f80926a595b4d7ab2057ba93e3f;hpb=1f83b424294a6fd78cb73cf43db3464ca7481774;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index f3561b5538..53a317a7c2 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -98,7 +98,7 @@ $maintenance->finalSetup();
 require_once "$IP/includes/Setup.php";
 
 // Initialize main config instance
-$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
+$maintenance->setConfig( MediaWikiServices::getInstance()->getMainConfig() );
 
 // Sanity-check required extensions are installed
 $maintenance->checkRequiredExtensions();
@@ -113,14 +113,18 @@ $maintenance->execute();
 // Potentially debug globals
 $maintenance->globals();
 
-// Perform deferred updates.
-$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
-$lbFactory->commitMasterChanges( $maintClass );
-DeferredUpdates::doUpdates();
+if ( $maintenance->getDbType() !== Maintenance::DB_NONE ) {
+	// Perform deferred updates.
+	$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+	$lbFactory->commitMasterChanges( $maintClass );
+	DeferredUpdates::doUpdates();
+}
 
 // log profiling info
 wfLogProfilingData();
 
-// Commit and close up!
-$lbFactory->commitMasterChanges( 'doMaintenance' );
-$lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );
+if ( isset( $lbFactory ) ) {
+	// Commit and close up!
+	$lbFactory->commitMasterChanges( 'doMaintenance' );
+	$lbFactory->shutdown( $lbFactory::SHUTDOWN_NO_CHRONPROT );
+}