From 642ffff84522c531008bd066247678e39fe144ba Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Thu, 25 May 2017 11:41:56 -0700 Subject: [PATCH] LanguageConverter: Avoid deprecated wfMemcKey() Change-Id: I7fe8e3ad6de2eb0a156b046805fa0eca928d0892 --- languages/LanguageConverter.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php index 4c3e5be207..5382df4989 100644 --- a/languages/LanguageConverter.php +++ b/languages/LanguageConverter.php @@ -60,11 +60,6 @@ class LanguageConverter { // 'bidirectional' 'unidirectional' 'disable' for each variant public $mManualLevel; - /** - * @var string Memcached key name - */ - public $mCacheKey; - public $mLangObj; public $mFlags; public $mDescCodeSep = ':', $mDescVarSep = ';'; @@ -95,7 +90,6 @@ class LanguageConverter { $this->mVariants = array_diff( $variants, $wgDisabledVariants ); $this->mVariantFallbacks = $variantfallbacks; $this->mVariantNames = Language::fetchLanguageNames(); - $this->mCacheKey = wfMemcKey( 'conversiontables', $maincode ); $defaultflags = [ // 'S' show converted text // '+' add rules for alltext @@ -866,8 +860,9 @@ class LanguageConverter { $this->mTablesLoaded = true; $this->mTables = false; $cache = ObjectCache::getInstance( $wgLanguageConverterCacheType ); + $cacheKey = $cache->makeKey( 'conversiontables', $this->mMainLanguageCode ); if ( $fromCache ) { - $this->mTables = $cache->get( $this->mCacheKey ); + $this->mTables = $cache->get( $cacheKey ); } if ( !$this->mTables || !array_key_exists( self::CACHE_VERSION_KEY, $this->mTables ) ) { // not in cache, or we need a fresh reload. @@ -882,7 +877,7 @@ class LanguageConverter { $this->postLoadTables(); $this->mTables[self::CACHE_VERSION_KEY] = true; - $cache->set( $this->mCacheKey, $this->mTables, 43200 ); + $cache->set( $cacheKey, $this->mTables, 43200 ); } } -- 2.20.1