From 5a1f6dbe6343e76b510537976b17aa8288698aa5 Mon Sep 17 00:00:00 2001 From: Reedy Date: Thu, 7 Feb 2019 03:30:57 +0000 Subject: [PATCH] Stop overwriting $cache in User::getCacheKey() Replace a few deprecated function calls Bug: T215483 Change-Id: I000b58d8bf67d9c1ea0123a7547b986e8ca69f25 --- includes/user/User.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/includes/user/User.php b/includes/user/User.php index f23c8ee586..2d97b68da7 100644 --- a/includes/user/User.php +++ b/includes/user/User.php @@ -496,7 +496,6 @@ class User implements IDBAccessObject, UserIdentity { * @return string */ protected function getCacheKey( WANObjectCache $cache ) { - $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); $lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory(); return $cache->makeGlobalKey( 'user', 'id', $lbFactory->getLocalDomainID(), $this->mId ); @@ -520,7 +519,7 @@ class User implements IDBAccessObject, UserIdentity { * @since 1.25 */ protected function loadFromCache() { - $cache = ObjectCache::getMainWANInstance(); + $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); $data = $cache->getWithSetCallback( $this->getCacheKey( $cache ), $cache::TTL_HOUR, @@ -2809,7 +2808,7 @@ class User implements IDBAccessObject, UserIdentity { return; } - $cache = ObjectCache::getMainWANInstance(); + $cache = MediaWikiServices::getInstance()->getMainWANObjectCache(); $key = $this->getCacheKey( $cache ); if ( $mode === 'refresh' ) { $cache->delete( $key, 1 ); -- 2.20.1