From: Alexandre Emsenhuber <mediawiki@emsenhuber.ch>
Date: Mon, 4 Aug 2014 20:13:39 +0000 (+0200)
Subject: Move debug log related settings up in Setup.php
X-Git-Tag: 1.31.0-rc.0~14387^2
X-Git-Url: http://git.cyclocoop.org//%22javascript:ModifierStyle%28%27%22.%24id.%22%27%29/%22?a=commitdiff_plain;h=beacdcb55c8d5d0ecf553b163d2f45d1828c8401;p=lhc%2Fweb%2Fwiklou.git

Move debug log related settings up in Setup.php

Since this doesn't rely on functions defined in GlobalFunctions.php;
this can be in the first "defaults" section of the file.

Change-Id: I24f1a14322d90d053adf51716516001477364e16
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 8574105e83..0c5cf92a86 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -405,6 +405,16 @@ if ( $wgCookieSecure === 'detect' ) {
 	$wgCookieSecure = ( WebRequest::detectProtocol() === 'https' );
 }
 
+// Back compatibility for $wgRateLimitLog deprecated with 1.23
+if ( $wgRateLimitLog && !array_key_exists( 'ratelimit', $wgDebugLogGroups ) ) {
+	$wgDebugLogGroups['ratelimit'] = $wgRateLimitLog;
+}
+
+if ( $wgProfileOnly ) {
+	$wgDebugLogGroups['profileoutput'] = $wgDebugLogFile;
+	$wgDebugLogFile = '';
+}
+
 wfProfileOut( $fname . '-defaults' );
 
 // Disable MWDebug for command line mode, this prevents MWDebug from eating up
@@ -469,16 +479,6 @@ if ( $wgTmpDirectory === false ) {
 	wfProfileOut( $fname . '-tempDir' );
 }
 
-// Back compatibility for $wgRateLimitLog deprecated with 1.23
-if ( $wgRateLimitLog && !array_key_exists( 'ratelimit', $wgDebugLogGroups ) ) {
-	$wgDebugLogGroups['ratelimit'] = $wgRateLimitLog;
-}
-
-if ( $wgProfileOnly ) {
-	$wgDebugLogGroups['profileoutput'] = $wgDebugLogFile;
-	$wgDebugLogFile = '';
-}
-
 wfProfileOut( $fname . '-defaults2' );
 wfProfileIn( $fname . '-misc1' );