From beacdcb55c8d5d0ecf553b163d2f45d1828c8401 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Mon, 4 Aug 2014 22:13:39 +0200 Subject: [PATCH] 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 --- includes/Setup.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) 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' ); -- 2.20.1