Revert r35794, r35795, r35797, r35798 for now.

Release notes claimed that this would deprecate $wgRateLimitsExcludedGroups, but in fact the code made it non-functional and removed it entirely.
Deprecation means that you *recommend against use of it*, but it continues to work.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0e4aead..480f3e9 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -397,8 +397,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Added md5 parameter to action=edit
 * (bug 14335) Logging in to unified account using API not possible
 * Added action=emailuser to send an email to a user
-* (bug 12859) Deprecate $wgRateLimitsExcludedGroups in favor of adding the
-  'noratelimit' user right.
 
 === Languages updated in 1.13 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 9b72283..28e9de0 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1135,12 +1135,10 @@ $wgGroupPermissions['sysop']['markbotedits']     = true;
 $wgGroupPermissions['sysop']['suppressredirect'] = true;
 $wgGroupPermissions['sysop']['apihighlimits']    = true;
 $wgGroupPermissions['sysop']['browsearchive']    = true;
-$wgGroupPermissions['sysop']['noratelimits']     = true;
 #$wgGroupPermissions['sysop']['mergehistory']     = true;
 
 // Permission to change users' group assignments
-$wgGroupPermissions['bureaucrat']['userrights']   = true;
-$wgGroupPermissions['bureaucrat']['noratelimits'] = true;
+$wgGroupPermissions['bureaucrat']['userrights']  = true;
 // Permission to change users' groups assignments across wikis
 #$wgGroupPermissions['bureaucrat']['userrights-interwiki'] = true;
 
@@ -2837,11 +2835,8 @@ $wgRateLimitLog = null;
 
 /**
  * Array of groups which should never trigger the rate limiter
- * 
- * Removed as of 1.13, use $wgGroupPermissions[]['noratelimit'] instead.
- * User::isPingLimitable() uses it now.
  */
-# $wgRateLimitsExcludedGroups = array();
+$wgRateLimitsExcludedGroups = array( 'sysop', 'bureaucrat' );
 
 /**
  * On Special:Unusedimages, consider images "used", if they are put

diff --git a/includes/User.php b/includes/User.php
index a57a95d..5a36eea 100644 (file)
--- a/includes/User.php
+++ b/includes/User.php
@@ -1101,7 +1101,8 @@ class User {
         * @return bool
         */
        public function isPingLimitable() {
-               return !$this->isAllowed('noratelimits');
+               global $wgRateLimitsExcludedGroups;
+               return array_intersect($this->getEffectiveGroups(), $wgRateLimitsExcludedGroups) == array();
        }
 
        /**