X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fauth%2FThrottler.php;h=3125bd3fd8e8da37939336bbb642ce6e2f93715e;hb=cce016b4a4cb04611657e3d3299cba94f2e354d2;hp=6d3b2f46e64a2e9c2e1992c4faa3cf4494836b12;hpb=638becad9826f135e9ab47ad4a9ca24b6ec6cc09;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/auth/Throttler.php b/includes/auth/Throttler.php
index 6d3b2f46e6..3125bd3fd8 100644
--- a/includes/auth/Throttler.php
+++ b/includes/auth/Throttler.php
@@ -127,10 +127,10 @@ class Throttler implements LoggerAwareInterface {
 				continue;
 			}
 
-			$throttleKey = wfGlobalCacheKey( 'throttler', $this->type, $index, $ipKey, $userKey );
+			$throttleKey = $this->cache->makeGlobalKey( 'throttler', $this->type, $index, $ipKey, $userKey );
 			$throttleCount = $this->cache->get( $throttleKey );
 
-			if ( !$throttleCount ) {  // counter not started yet
+			if ( !$throttleCount ) { // counter not started yet
 				$this->cache->add( $throttleKey, 1, $expiry );
 			} elseif ( $throttleCount < $count ) { // throttle limited not yet reached
 				$this->cache->incr( $throttleKey );
@@ -170,7 +170,7 @@ class Throttler implements LoggerAwareInterface {
 		$userKey = $username ? md5( $username ) : null;
 		foreach ( $this->conditions as $index => $specificThrottle ) {
 			$ipKey = isset( $specificThrottle['allIPs'] ) ? null : $ip;
-			$throttleKey = wfGlobalCacheKey( 'throttler', $this->type, $index, $ipKey, $userKey );
+			$throttleKey = $this->cache->makeGlobalKey( 'throttler', $this->type, $index, $ipKey, $userKey );
 			$this->cache->delete( $throttleKey );
 		}
 	}