From 987c5cf9f00722e21c412b7a9f31d93a8e352d76 Mon Sep 17 00:00:00 2001
From: Platonides <platonides@users.mediawiki.org>
Date: Sat, 6 Nov 2010 23:49:06 +0000
Subject: [PATCH] Follow up r75392. DefaultSettings.php were not included by
 LocalSettings, since it was already required in global scope. Force an
 inclusion before LocalSettings. It is safe to do so, since it only contains
 variables, shame to anyone adding functions or classes there!

---
 includes/installer/Installer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7b1d4517a2..1222802ed9 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -231,7 +231,7 @@ abstract class Installer {
 		wfRestoreWarnings();
 
 		if( $ls ) {
-			$wgCacheEpoch = $wgCommandLineMode = false;
+			require( "$IP/includes/DefaultSettings.php" );
 			require_once( "$IP/LocalSettings.php" );
 			$vars = get_defined_vars();
 			if( isset( $vars['wgUpgradeKey'] ) && $vars['wgUpgradeKey'] ) {
-- 
2.20.1