From 2f1f04dd4f0d0b93fc59320764e5fa1c7abba7bf Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 25 May 2017 12:17:27 -0700 Subject: [PATCH] User: Avoid deprecated wfMemcKey() And ObjectCache::getMainWANInstance() while we're at it. Change-Id: Id0280aec72202f3b3098c9c3b563541c2c0f2900 --- includes/user/User.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/includes/user/User.php b/includes/user/User.php index 131e419cd7..99610c3434 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -2527,8 +2527,9 @@ class User implements IDBAccessObject { public function touch() { $id = $this->getId(); if ( $id ) { - $key = wfMemcKey( 'user-quicktouched', 'id', $id ); - ObjectCache::getMainWANInstance()->touchCheckKey( $key ); + $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); + $key = $cache->makeKey( 'user-quicktouched', 'id', $id ); + $cache->touchCheckKey( $key ); $this->mQuickTouched = null; } } @@ -2555,8 +2556,8 @@ class User implements IDBAccessObject { if ( $this->mId ) { if ( $this->mQuickTouched === null ) { - $key = wfMemcKey( 'user-quicktouched', 'id', $this->mId ); - $cache = ObjectCache::getMainWANInstance(); + $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); + $key = $cache->makeKey( 'user-quicktouched', 'id', $this->mId ); $this->mQuickTouched = wfTimestamp( TS_MW, $cache->getCheckKeyTime( $key ) ); } -- 2.20.1