http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76339
Revision: 76339
Author: platonides
Date: 2010-11-08 20:51:15 +0000 (Mon, 08 Nov 2010)
Log Message:
-----------
Revert r72959
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/DefaultSettings.php
trunk/phase3/includes/User.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2010-11-08 20:40:55 UTC (rev 76338)
+++ trunk/phase3/RELEASE-NOTES 2010-11-08 20:51:15 UTC (rev 76339)
@@ -181,8 +181,6 @@
* (bug 24007) Diff pages now mention the number of users having edited
intermediate revisions
* Added new hook GetIP
-* (bug 16574) Allow administrators to temporarily disable the account creation
- limit for IP addresses: [[MediaWiki:Ratelimit-excluded-ips]]
* Special:Version now displays whether a SQLite database supports full-text
search.
* TS_ISO_8691_BASIC was added as a time format, which is used by ResourceLoader
Modified: trunk/phase3/includes/DefaultSettings.php
===================================================================
--- trunk/phase3/includes/DefaultSettings.php 2010-11-08 20:40:55 UTC (rev
76338)
+++ trunk/phase3/includes/DefaultSettings.php 2010-11-08 20:51:15 UTC (rev
76339)
@@ -3446,8 +3446,6 @@
/**
* Array of IPs which should be excluded from rate limits.
* This may be useful for whitelisting NAT gateways for conferences, etc.
- * Wiki administrators can add additional IP addresses via
- * [[MediaWiki:Ratelimit-excluded-ips]]
*/
$wgRateLimitsExcludedIPs = array();
Modified: trunk/phase3/includes/User.php
===================================================================
--- trunk/phase3/includes/User.php 2010-11-08 20:40:55 UTC (rev 76338)
+++ trunk/phase3/includes/User.php 2010-11-08 20:51:15 UTC (rev 76339)
@@ -1224,34 +1224,10 @@
// Deprecated, but kept for backwards-compatibility
config
return false;
}
-
- wfDebug( "Checking the list of IP addresses excluded from rate
limit..\n" );
-
- // Read list of IP addresses from MediaWiki namespace
- $message = wfMsgForContentNoTrans( 'ratelimit-excluded-ips' );
- $lines = explode( "\n", $message );
- foreach( $lines as $line ) {
- // Remove comment lines
- $comment = substr( trim( $line ), 0, 1 );
- if ( $comment == '#' || $comment == '' ) {
- continue;
- }
- // Remove additional comments after an IP address
- $comment = strpos( $line, '#' );
- if ( $comment > 0 ) {
- $line = trim( substr( $line, 0, $comment-1 ) );
- if ( IP::isValid( $line ) ) {
- $wgRateLimitsExcludedIPs[] =
IP::sanitizeIP( $line );
- }
- }
- }
-
- $ip = IP::sanitizeIP( wfGetIP() );
- if( in_array( $ip, $wgRateLimitsExcludedIPs ) ) {
+ if( in_array( wfGetIP(), $wgRateLimitsExcludedIPs ) ) {
// No other good way currently to disable rate limits
// for specific IPs. :P
// But this is a crappy hack and should die.
- wfDebug( "IP $ip matches the list of rate limit
excluded IPs\n" );
return false;
}
return !$this->isAllowed('noratelimit');
Modified: trunk/phase3/languages/messages/MessagesEn.php
===================================================================
--- trunk/phase3/languages/messages/MessagesEn.php 2010-11-08 20:40:55 UTC
(rev 76338)
+++ trunk/phase3/languages/messages/MessagesEn.php 2010-11-08 20:51:15 UTC
(rev 76339)
@@ -1141,11 +1141,6 @@
* Italiano|it
* Nederlands|nl', # do not translate or duplicate this message to other
languages
'suspicious-userlogout' => 'Your request to log out was denied because it
looks like it was sent by a broken browser or caching proxy.',
-'ratelimit-excluded-ips' => ' #<!-- leave this line exactly as it is -->
<pre>
-# Syntax is as follows:
-# * Everything from a "#" character to the end of the line is a comment
-# * Every non-blank line is an IP address excluded from the rate limit
- #</pre> <!-- leave this line exactly as it is -->',
# JavaScript password checks
'password-strength' => 'Estimated password strength: $1',
Modified: trunk/phase3/maintenance/language/messages.inc
===================================================================
--- trunk/phase3/maintenance/language/messages.inc 2010-11-08 20:40:55 UTC
(rev 76338)
+++ trunk/phase3/maintenance/language/messages.inc 2010-11-08 20:51:15 UTC
(rev 76339)
@@ -462,7 +462,6 @@
'loginlanguagelabel',
'loginlanguagelinks',
'suspicious-userlogout',
- 'ratelimit-excluded-ips',
),
'passwordstrength' => array(
'password-strength',
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
