jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/393646 )

Change subject: Use WANObjectCache::makeKey() in ChangesFeed
......................................................................


Use WANObjectCache::makeKey() in ChangesFeed

Change-Id: Ia029873e5d0883d177007555ad494cae9e00c407
---
M includes/changes/ChangesFeed.php
1 file changed, 3 insertions(+), 2 deletions(-)

Approvals:
  Krinkle: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/changes/ChangesFeed.php b/includes/changes/ChangesFeed.php
index df964e0..7ac8cd0 100644
--- a/includes/changes/ChangesFeed.php
+++ b/includes/changes/ChangesFeed.php
@@ -82,10 +82,11 @@
                        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 );
 

-- 
To view, visit https://gerrit.wikimedia.org/r/393646
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ia029873e5d0883d177007555ad494cae9e00c407
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to