From a914de4041284bafb7cc9c4d3835b0ba7bc9d5b1 Mon Sep 17 00:00:00 2001 From: Bryan Davis Date: Tue, 17 Nov 2015 14:55:42 -0700 Subject: [PATCH] Remove deprecated wgRateLimitLog Remove the backwards compatibility shims for $wgRateLimitLog which was deprecated in 1.23 (I86131c4). Change-Id: I771bbaff43b44d011bff81ddda4f35166ea5f77e --- RELEASE-NOTES-1.27 | 1 + includes/DefaultSettings.php | 7 ------- includes/Setup.php | 5 ----- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index e124832be8..e426e83941 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -51,6 +51,7 @@ production. a thumbnail handler. See $wgForeignFileRepos documentation for tweaks. * (T27397) WebP is enabled by default as an uploadable filetype. * (T48998) $wgArticlePath must now be either a full url, or start with a "/". +* $wgRateLimitLog was removed; use $wgDebugLogGroups['ratelimit'] instead. === New features in 1.27 === * $wgDataCenterId and $wgDataCenterRoles where added, which will serve as diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index bf6e245d72..8763ba33f1 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -5285,13 +5285,6 @@ $wgRateLimits = array( ), ); -/** - * Set to a filename to log rate limiter hits. - * - * @deprecated since 1.23, use $wgDebugLogGroups['ratelimit'] instead - */ -$wgRateLimitLog = null; - /** * Array of IPs which should be excluded from rate limits. * This may be useful for whitelisting NAT gateways for conferences, etc. diff --git a/includes/Setup.php b/includes/Setup.php index bd20ac3579..44c1f71a9f 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -474,11 +474,6 @@ 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 = ''; -- 2.20.1