From: Platonides <platonides@users.mediawiki.org>
Date: Sat, 6 Nov 2010 23:49:06 +0000 (+0000)
Subject: Follow up r75392.
X-Git-Tag: 1.31.0-rc.0~34030
X-Git-Url: https://git.cyclocoop.org/%7B%7B%20url_for%28?a=commitdiff_plain;h=987c5cf9f00722e21c412b7a9f31d93a8e352d76;p=lhc%2Fweb%2Fwiklou.git

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!
---

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'] ) {