From a0d422e67f6facfc36714d25102956112b345b3d Mon Sep 17 00:00:00 2001
From: Kunal Mehta <legoktm@gmail.com>
Date: Tue, 3 Mar 2015 23:51:44 -0800
Subject: [PATCH] maintenance: Defer initilization of 'main' Config until after
 Setup.php runs

Bug: T90680
Change-Id: I72d6306404bc1f6c7a605853130a026e9858b493
---
 maintenance/doMaintenance.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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();
 
-- 
2.20.1