Legoktm has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/355643 )
Change subject: LanguageConverter: Avoid deprecated wfMemcKey()
......................................................................
LanguageConverter: Avoid deprecated wfMemcKey()
Change-Id: I7fe8e3ad6de2eb0a156b046805fa0eca928d0892
---
M languages/LanguageConverter.php
1 file changed, 3 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/43/355643/1
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 4c3e5be..5382df4 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -60,11 +60,6 @@
// '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 @@
$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 @@
$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 @@
$this->postLoadTables();
$this->mTables[self::CACHE_VERSION_KEY] = true;
- $cache->set( $this->mCacheKey, $this->mTables, 43200 );
+ $cache->set( $cacheKey, $this->mTables, 43200 );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/355643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7fe8e3ad6de2eb0a156b046805fa0eca928d0892
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
