From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 10 Mar 2010 12:44:57 +0000 (+0000)
Subject: Fix regression from r51677, still need to load AdminSettings if it exists for back... 
X-Git-Tag: 1.31.0-rc.0~37495
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=017e8b29b3f5fb25d92d8bcd14486f67ca1efb28;p=lhc%2Fweb%2Fwiklou.git

Fix regression from r51677, still need to load AdminSettings if it exists for back-compat. Needs backporting to REL1_16.
---

diff --git a/maintenance/doMaintenance.php b/maintenance/doMaintenance.php
index f13ca075bc..008c5b87e1 100644
--- a/maintenance/doMaintenance.php
+++ b/maintenance/doMaintenance.php
@@ -76,6 +76,11 @@ if( file_exists( "$IP/wmf-config/wikimedia-mode" ) ) {
 } else {
 	require_once( $maintenance->loadSettings() );
 }
+if ( $maintenance->getDbType() === Maintenance::DB_ADMIN &&
+		is_readable( "$IP/AdminSettings.php" ) )
+{
+	require( "$IP/AdminSettings.php" );
+}
 $maintenance->finalSetup();
 // Some last includes
 require_once( "$IP/includes/Setup.php" );