| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1102,7 +1102,13 @@ |
| 1103 | 1103 | */ |
| 1104 | 1104 | public function isPingLimitable() { |
| 1105 | 1105 | global $wgRateLimitsExcludedGroups; |
| 1106 | | - return array_intersect($this->getEffectiveGroups(), $wgRateLimitsExcludedGroups) == array(); |
| | 1106 | + if ( array_intersect($this->getEffectiveGroups(), $wgRateLimitsExcludedGroups) == array() || |
| | 1107 | + !$this->isAllowed('noratelimit') ) { |
| | 1108 | + return true; |
| | 1109 | + } |
| | 1110 | + else { |
| | 1111 | + return false; |
| | 1112 | + } |
| 1107 | 1113 | } |
| 1108 | 1114 | |
| 1109 | 1115 | /** |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1140,10 +1140,12 @@ |
| 1141 | 1141 | $wgGroupPermissions['sysop']['suppressredirect'] = true; |
| 1142 | 1142 | $wgGroupPermissions['sysop']['apihighlimits'] = true; |
| 1143 | 1143 | $wgGroupPermissions['sysop']['browsearchive'] = true; |
| | 1144 | +$wgGroupPermissions['sysop']['noratelimit'] = true; |
| 1144 | 1145 | #$wgGroupPermissions['sysop']['mergehistory'] = true; |
| 1145 | 1146 | |
| 1146 | 1147 | // Permission to change users' group assignments |
| 1147 | 1148 | $wgGroupPermissions['bureaucrat']['userrights'] = true; |
| | 1149 | +$wgGroupPermissions['bureaucrat']['noratelimit'] = true; |
| 1148 | 1150 | // Permission to change users' groups assignments across wikis |
| 1149 | 1151 | #$wgGroupPermissions['bureaucrat']['userrights-interwiki'] = true; |
| 1150 | 1152 | |
| — | — | @@ -2848,9 +2850,15 @@ |
| 2849 | 2851 | |
| 2850 | 2852 | /** |
| 2851 | 2853 | * Array of groups which should never trigger the rate limiter |
| | 2854 | + * |
| | 2855 | + * @deprecated as of 1.13.0, the preferred method is using |
| | 2856 | + * $wgGroupPermissions[]['noratelimit']. However, this will still |
| | 2857 | + * work if desired. |
| | 2858 | + * |
| | 2859 | + * $wgRateLimitsExcludedGroups = array( 'sysop', 'bureaucrat' ); |
| 2852 | 2860 | */ |
| 2853 | | -$wgRateLimitsExcludedGroups = array( 'sysop', 'bureaucrat' ); |
| 2854 | 2861 | |
| | 2862 | + |
| 2855 | 2863 | /** |
| 2856 | 2864 | * On Special:Unusedimages, consider images "used", if they are put |
| 2857 | 2865 | * into a category. Default (false) is not to count those as used. |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -52,6 +52,8 @@ |
| 53 | 53 | * $wgActiveUserEditCount sets the number of edits that must be performed over |
| 54 | 54 | a certain number of days to be considered active |
| 55 | 55 | * $wgActiveUserDays is that number of days |
| | 56 | +* $wgRateLimitsExcludedGroups has been deprecated in favor of |
| | 57 | + $wgGroupPermissions[]['noratelimit']. The former still works, however. |
| 56 | 58 | |
| 57 | 59 | === New features in 1.13 === |
| 58 | 60 | |
| — | — | @@ -335,6 +337,8 @@ |
| 336 | 338 | * (bug 14386) Fix subpage namespace oddity when moving a talk page |
| 337 | 339 | * (bug 11771) Signup form now not shown if in read-only mode. |
| 338 | 340 | * (bug 10080) Users can now modify an existing block without unblocking first. |
| | 341 | +* (bug 12859) $wgRateLimitsExcludedGroups has been deprecated in favor of |
| | 342 | + $wgGroupPermissions[]['noratelimit']. |
| 339 | 343 | |
| 340 | 344 | === API changes in 1.13 === |
| 341 | 345 | |