Merge "Block: Avoid deprecated wfMemcKey()"

diff --git a/includes/Block.php b/includes/Block.php
index 0b7f7b2..a7e7308 100644 (file)
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -710,7 +710,7 @@ class Block {
                // than getting the msg raw and explode()'ing it.
                $cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
                $lines = $cache->getWithSetCallback(
-                       wfMemcKey( 'ipb', 'autoblock', 'whitelist' ),
+                       $cache->makeKey( 'ipb', 'autoblock', 'whitelist' ),
                        $cache::TTL_DAY,
                        function ( $curValue, &$ttl, array &$setOpts ) {
                                $setOpts += Database::getCacheSetOptions( wfGetDB( DB_REPLICA ) );