From c8d82c02c3091b77cae1f7a076655165d0b35def Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Mon, 27 Nov 2017 12:03:47 -0800 Subject: [PATCH] Use WANObjectCache::makeKey() in ChangesFeed Change-Id: Ia029873e5d0883d177007555ad494cae9e00c407 --- includes/changes/ChangesFeed.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/changes/ChangesFeed.php b/includes/changes/ChangesFeed.php index df964e0a2b..7ac8cd0ed0 100644 --- a/includes/changes/ChangesFeed.php +++ b/includes/changes/ChangesFeed.php @@ -82,10 +82,11 @@ class ChangesFeed { return null; } + $cache = ObjectCache::getMainWANInstance(); $optionsHash = md5( serialize( $opts->getAllValues() ) ) . $wgRenderHashAppend; - $timekey = wfMemcKey( + $timekey = $cache->makeKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash, 'timestamp' ); - $key = wfMemcKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash ); + $key = $cache->makeKey( $this->type, $this->format, $wgLang->getCode(), $optionsHash ); FeedUtils::checkPurge( $timekey, $key ); -- 2.20.1