From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 20 Mar 2019 01:21:18 +0000 (-0700)
Subject: Move the "v1" to an adjacent key component in Title::loadRestrictions
X-Git-Tag: 1.34.0-rc.0~2464^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=5cb467157063aa46c6d6b10ccd89f0277330e528;p=lhc%2Fweb%2Fwiklou.git

Move the "v1" to an adjacent key component in Title::loadRestrictions

This keeps the WAN cache statsd metrics under page-restrictions as before

Change-Id: I30b716cbc362c98f09ba77a4b3f68a821d966d44
---

diff --git a/includes/Title.php b/includes/Title.php
index 2e43b8dfc7..d8aeb6293c 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -3342,7 +3342,7 @@ class Title implements LinkTarget, IDBAccessObject {
 				$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
 				$rows = $cache->getWithSetCallback(
 					// Page protections always leave a new null revision
-					$cache->makeKey( 'page-restrictions-v1', $id, $this->getLatestRevID() ),
+					$cache->makeKey( 'page-restrictions', 'v1', $id, $this->getLatestRevID() ),
 					$cache::TTL_DAY,
 					function ( $curValue, &$ttl, array &$setOpts ) use ( $loadRestrictionsFromDb ) {
 						$dbr = wfGetDB( DB_REPLICA );