From: Kunal Mehta <legoktm@gmail.com>
Date: Wed, 4 Mar 2015 07:51:44 +0000 (-0800)
Subject: maintenance: Defer initilization of 'main' Config until after Setup.php runs
X-Git-Tag: 1.31.0-rc.0~12168^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=a0d422e67f6facfc36714d25102956112b345b3d;p=lhc%2Fweb%2Fwiklou.git

maintenance: Defer initilization of 'main' Config until after Setup.php runs

Bug: T90680
Change-Id: I72d6306404bc1f6c7a605853130a026e9858b493
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index cc2167e33a..4b9ad9c22d 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -92,11 +92,13 @@ if ( $maintenance->getDbType() === Maintenance::DB_NONE ) {
 	}
 }
 
-$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
 $maintenance->finalSetup();
 // Some last includes
 require_once "$IP/includes/Setup.php";
 
+// Initialize main config instance
+$maintenance->setConfig( ConfigFactory::getDefaultInstance()->makeConfig( 'main' ) );
+
 // Do the work
 $maintenance->execute();