Reverted r47352, $wgRateLimitsExcludedIPs is to be replaced by APCOND_ISIP.

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 79a42db..2204a61 100644 (file)
--- 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 3085628..e168fe9 100644 (file)
--- 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');
        }