| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -462,7 +462,6 @@ |
| 463 | 463 | 'loginlanguagelabel', |
| 464 | 464 | 'loginlanguagelinks', |
| 465 | 465 | 'suspicious-userlogout', |
| 466 | | - 'ratelimit-excluded-ips', |
| 467 | 466 | ), |
| 468 | 467 | 'passwordstrength' => array( |
| 469 | 468 | 'password-strength', |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -1224,34 +1224,10 @@ |
| 1225 | 1225 | // Deprecated, but kept for backwards-compatibility config |
| 1226 | 1226 | return false; |
| 1227 | 1227 | } |
| 1228 | | - |
| 1229 | | - wfDebug( "Checking the list of IP addresses excluded from rate limit..\n" ); |
| 1230 | | - |
| 1231 | | - // Read list of IP addresses from MediaWiki namespace |
| 1232 | | - $message = wfMsgForContentNoTrans( 'ratelimit-excluded-ips' ); |
| 1233 | | - $lines = explode( "\n", $message ); |
| 1234 | | - foreach( $lines as $line ) { |
| 1235 | | - // Remove comment lines |
| 1236 | | - $comment = substr( trim( $line ), 0, 1 ); |
| 1237 | | - if ( $comment == '#' || $comment == '' ) { |
| 1238 | | - continue; |
| 1239 | | - } |
| 1240 | | - // Remove additional comments after an IP address |
| 1241 | | - $comment = strpos( $line, '#' ); |
| 1242 | | - if ( $comment > 0 ) { |
| 1243 | | - $line = trim( substr( $line, 0, $comment-1 ) ); |
| 1244 | | - if ( IP::isValid( $line ) ) { |
| 1245 | | - $wgRateLimitsExcludedIPs[] = IP::sanitizeIP( $line ); |
| 1246 | | - } |
| 1247 | | - } |
| 1248 | | - } |
| 1249 | | - |
| 1250 | | - $ip = IP::sanitizeIP( wfGetIP() ); |
| 1251 | | - if( in_array( $ip, $wgRateLimitsExcludedIPs ) ) { |
| | 1228 | + if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) { |
| 1252 | 1229 | // No other good way currently to disable rate limits |
| 1253 | 1230 | // for specific IPs. :P |
| 1254 | 1231 | // But this is a crappy hack and should die. |
| 1255 | | - wfDebug( "IP $ip matches the list of rate limit excluded IPs\n" ); |
| 1256 | 1232 | return false; |
| 1257 | 1233 | } |
| 1258 | 1234 | return !$this->isAllowed('noratelimit'); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3446,8 +3446,6 @@ |
| 3447 | 3447 | /** |
| 3448 | 3448 | * Array of IPs which should be excluded from rate limits. |
| 3449 | 3449 | * This may be useful for whitelisting NAT gateways for conferences, etc. |
| 3450 | | - * Wiki administrators can add additional IP addresses via |
| 3451 | | - * [[MediaWiki:Ratelimit-excluded-ips]] |
| 3452 | 3450 | */ |
| 3453 | 3451 | $wgRateLimitsExcludedIPs = array(); |
| 3454 | 3452 | |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -1141,11 +1141,6 @@ |
| 1142 | 1142 | * Italiano|it |
| 1143 | 1143 | * Nederlands|nl', # do not translate or duplicate this message to other languages |
| 1144 | 1144 | 'suspicious-userlogout' => 'Your request to log out was denied because it looks like it was sent by a broken browser or caching proxy.', |
| 1145 | | -'ratelimit-excluded-ips' => ' #<!-- leave this line exactly as it is --> <pre> |
| 1146 | | -# Syntax is as follows: |
| 1147 | | -# * Everything from a "#" character to the end of the line is a comment |
| 1148 | | -# * Every non-blank line is an IP address excluded from the rate limit |
| 1149 | | - #</pre> <!-- leave this line exactly as it is -->', |
| 1150 | 1145 | |
| 1151 | 1146 | # JavaScript password checks |
| 1152 | 1147 | 'password-strength' => 'Estimated password strength: $1', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -181,8 +181,6 @@ |
| 182 | 182 | * (bug 24007) Diff pages now mention the number of users having edited |
| 183 | 183 | intermediate revisions |
| 184 | 184 | * Added new hook GetIP |
| 185 | | -* (bug 16574) Allow administrators to temporarily disable the account creation |
| 186 | | - limit for IP addresses: [[MediaWiki:Ratelimit-excluded-ips]] |
| 187 | 185 | * Special:Version now displays whether a SQLite database supports full-text |
| 188 | 186 | search. |
| 189 | 187 | * TS_ISO_8691_BASIC was added as a time format, which is used by ResourceLoader |