From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 25 May 2017 19:17:27 +0000 (-0700)
Subject: User: Avoid deprecated wfMemcKey()
X-Git-Tag: 1.31.0-rc.0~3118^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=2f1f04dd4f0d0b93fc59320764e5fa1c7abba7bf;p=lhc%2Fweb%2Fwiklou.git

User: Avoid deprecated wfMemcKey()

And ObjectCache::getMainWANInstance() while we're at it.

Change-Id: Id0280aec72202f3b3098c9c3b563541c2c0f2900
---

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 ) );
 			}