Kill $wgRateLimitsExcludedGroups which was deprecated in 1.13

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5cbf237..b3c2049 100644 (file)
--- 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 9ff846d..3ba7a95 100644 (file)
--- 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