auth: Avoid deprecated wfGlobalCacheKey()
authorKunal Mehta <legoktm@member.fsf.org>
Tue, 23 May 2017 22:10:17 +0000 (15:10 -0700)
committerKunal Mehta <legoktm@member.fsf.org>
Tue, 23 May 2017 22:10:17 +0000 (15:10 -0700)
Change-Id: I2d6fa73fe857a0495df13aa25071e69b1ec2ba70

includes/auth/Throttler.php

index 8a10ecb..3125bd3 100644 (file)
@@ -127,7 +127,7 @@ 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
@@ -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 );
                }
        }