From: Sam Reed <reedy@users.mediawiki.org>
Date: Fri, 6 May 2011 21:57:55 +0000 (+0000)
Subject: Kill $wgRateLimitsExcludedGroups which was deprecated in 1.13
X-Git-Tag: 1.31.0-rc.0~30365
X-Git-Url: http://git.cyclocoop.org/data/Fool?a=commitdiff_plain;h=33749b0cadadbefa02372bcfb020442bb022c156;p=lhc%2Fweb%2Fwiklou.git

Kill $wgRateLimitsExcludedGroups which was deprecated in 1.13
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5cbf237c66..b3c2049806 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -3669,17 +3669,6 @@ $wgRateLimits = array(
  */
 $wgRateLimitLog = null;
 
-/**
- * Array of groups which should never trigger the rate limiter
- *
- * @deprecated since 1.13.0, the preferred method is using
- *  $wgGroupPermissions[]['noratelimit']. However, this will still
- *  work if desired.
- *
- *  $wgRateLimitsExcludedGroups = array( 'sysop', 'bureaucrat' );
- */
-$wgRateLimitsExcludedGroups = array();
-
 /**
  * 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/User.php b/includes/User.php
index 9ff846dbaa..3ba7a953ff 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -1299,12 +1299,7 @@ class User {
 	 * @return Bool True if rate limited
 	 */
 	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