From 22d81e24e853f389f5d91a1e4a4404c2d5f5a0b5 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Wed, 27 May 2009 05:30:09 +0000 Subject: [PATCH] Reverted r47352, $wgRateLimitsExcludedIPs is to be replaced by APCOND_ISIP. --- includes/DefaultSettings.php | 6 ------ includes/User.php | 7 ------- 2 files changed, 13 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 79a42db08a..2204a6181a 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -3325,12 +3325,6 @@ $wgRateLimitLog = null; */ $wgRateLimitsExcludedGroups = array(); -/** - * Array of IPs which should be excluded from rate limits. - * This may be useful for whitelisting NAT gateways for conferences, etc. - */ -$wgRateLimitsExcludedIPs = array(); - /** * On Special:Unusedimages, consider images "used", if they are put * into a category. Default (false) is not to count those as used. diff --git a/includes/User.php b/includes/User.php index 3085628e55..e168fe9a29 100644 --- a/includes/User.php +++ b/includes/User.php @@ -1169,17 +1169,10 @@ class User { */ public function isPingLimitable() { global $wgRateLimitsExcludedGroups; - global $wgRateLimitsExcludedIPs; if( array_intersect( $this->getEffectiveGroups(), $wgRateLimitsExcludedGroups ) ) { // Deprecated, but kept for backwards-compatibility config return false; } - if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) { - // No other good way currently to disable rate limits - // for specific IPs. :P - // But this is a crappy hack and should die. - return false; - } return !$this->isAllowed('noratelimit'); } -- 2.20.1