From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 20 Nov 2017 07:27:34 +0000 (-0800)
Subject: objectcache: make sure variant keys are namespaced as keys should be
X-Git-Tag: 1.31.0-rc.0~1454^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=f23fb835fc49dcb38f9ec898831921a908e8c6e4;p=lhc%2Fweb%2Fwiklou.git

objectcache: make sure variant keys are namespaced as keys should be

Change-Id: I02597d6dbc2febace25ef6d1981f69dc704efe8d
---

diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 73e4a9a263..f2048fe612 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -917,7 +917,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 					// Value existed before with a different version; use variant key.
 					// Reflect purges to $key by requiring that this key value be newer.
 					$value = $this->doGetWithSetCallback(
-						'cache-variant:' . md5( $key ) . ":$version",
+						$this->makeGlobalKey( 'WANCache-key-variant', md5( $key ), $version ),
 						$ttl,
 						$callback,
 						// Regenerate value if not newer than $key