| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1169,17 +1169,10 @@ |
| 1170 | 1170 | */ |
| 1171 | 1171 | public function isPingLimitable() { |
| 1172 | 1172 | global $wgRateLimitsExcludedGroups; |
| 1173 | | - global $wgRateLimitsExcludedIPs; |
| 1174 | 1173 | if( array_intersect( $this->getEffectiveGroups(), $wgRateLimitsExcludedGroups ) ) { |
| 1175 | 1174 | // Deprecated, but kept for backwards-compatibility config |
| 1176 | 1175 | return false; |
| 1177 | 1176 | } |
| 1178 | | - if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) { |
| 1179 | | - // No other good way currently to disable rate limits |
| 1180 | | - // for specific IPs. :P |
| 1181 | | - // But this is a crappy hack and should die. |
| 1182 | | - return false; |
| 1183 | | - } |
| 1184 | 1177 | return !$this->isAllowed('noratelimit'); |
| 1185 | 1178 | } |
| 1186 | 1179 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3326,12 +3326,6 @@ |
| 3327 | 3327 | $wgRateLimitsExcludedGroups = array(); |
| 3328 | 3328 | |
| 3329 | 3329 | /** |
| 3330 | | - * Array of IPs which should be excluded from rate limits. |
| 3331 | | - * This may be useful for whitelisting NAT gateways for conferences, etc. |
| 3332 | | - */ |
| 3333 | | -$wgRateLimitsExcludedIPs = array(); |
| 3334 | | - |
| 3335 | | -/** |
| 3336 | 3330 | * On Special:Unusedimages, consider images "used", if they are put |
| 3337 | 3331 | * into a category. Default (false) is not to count those as used. |
| 3338 | 3332 | */ |