| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1146,17 +1146,10 @@ |
| 1147 | 1147 | */ |
| 1148 | 1148 | public function isPingLimitable() { |
| 1149 | 1149 | global $wgRateLimitsExcludedGroups; |
| 1150 | | - global $wgRateLimitsExcludedIPs; |
| 1151 | 1150 | if( array_intersect( $this->getEffectiveGroups(), $wgRateLimitsExcludedGroups ) ) { |
| 1152 | 1151 | // Deprecated, but kept for backwards-compatibility config |
| 1153 | 1152 | return false; |
| 1154 | 1153 | } |
| 1155 | | - if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) { |
| 1156 | | - // No other good way currently to disable rate limits |
| 1157 | | - // for specific IPs. :P |
| 1158 | | - // But this is a crappy hack and should die. |
| 1159 | | - return false; |
| 1160 | | - } |
| 1161 | 1154 | return !$this->isAllowed('noratelimit'); |
| 1162 | 1155 | } |
| 1163 | 1156 | |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3206,16 +3206,6 @@ |
| 3207 | 3207 | $wgRateLimitsExcludedGroups = array(); |
| 3208 | 3208 | |
| 3209 | 3209 | /** |
| 3210 | | - * Array of IPs which should never trigger the rate limiter. |
| 3211 | | - * Really this is a cruddy hack and should be replaced with |
| 3212 | | - * an "anti-block" or something which can be managed through |
| 3213 | | - * the wiki UI. |
| 3214 | | - * |
| 3215 | | - * $wgRateLimitsExcludedIPs = array( '1.2.3.4' ); |
| 3216 | | - */ |
| 3217 | | -$wgRateLimitsExcludedIPs = array(); |
| 3218 | | - |
| 3219 | | -/** |
| 3220 | 3210 | * On Special:Unusedimages, consider images "used", if they are put |
| 3221 | 3211 | * into a category. Default (false) is not to count those as used. |
| 3222 | 3212 | */ |