From: CSteipp <csteipp@wikimedia.org>
Date: Tue, 9 Feb 2016 19:50:19 +0000 (+0000)
Subject: Revert "Limit ip-all/subnet-all ping limts per wiki"
X-Git-Tag: 1.31.0-rc.0~8016^2
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=01e345e04bcb3f865b66670638114980b500e73b;p=lhc%2Fweb%2Fwiklou.git

Revert "Limit ip-all/subnet-all ping limts per wiki"

This reverts commit 461406e31864e75fcd1c2f5ac967cb7ba5e5a182.

My mistake, we've always used global keys for ip/subnet.

Change-Id: I8bc1bfdf61ae5c0988a913871a7292faed372141
---

diff --git a/includes/user/User.php b/includes/user/User.php
index 6638fb7ded..da6307551c 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1789,14 +1789,14 @@ class User implements IDBAccessObject {
 			// ip-based limits
 			if ( isset( $limits['ip'] ) ) {
 				$ip = $this->getRequest()->getIP();
-				$keys[wfMemcKey( 'limiter', $action, 'ip', $ip )] = $limits['ip'];
+				$keys["mediawiki:limiter:$action:ip:$ip"] = $limits['ip'];
 			}
 			// subnet-based limits
 			if ( isset( $limits['subnet'] ) ) {
 				$ip = $this->getRequest()->getIP();
 				$subnet = IP::getSubnet( $ip );
 				if ( $subnet !== false ) {
-					$keys[wfMemcKey( 'limiter', $action, 'subnet', $subnet )] = $limits['subnet'];
+					$keys["mediawiki:limiter:$action:subnet:$subnet"] = $limits['subnet'];
 				}
 			}
 		}