From 017e8b29b3f5fb25d92d8bcd14486f67ca1efb28 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Wed, 10 Mar 2010 12:44:57 +0000
Subject: [PATCH] Fix regression from r51677, still need to load AdminSettings
 if it exists for back-compat. Needs backporting to REL1_16.

---
 maintenance/doMaintenance.php | 5 +++++
 1 file changed, 5 insertions(+)

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