X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguageConverter.php;h=5a9f652ef027c0bee0782213ef123cd82376fc26;hb=9841cc11bee010a89cec372e6f05db91f8b1b52a;hp=b31b10ffc7c014ca2832383f5e37a80a523c6257;hpb=0a5072c927660e26977ef304e9dad5549046d540;p=lhc%2Fweb%2Fwiklou.git
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index b31b10ffc7..5a9f652ef0 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -18,6 +18,7 @@
* @file
* @ingroup Language
*/
+use MediaWiki\MediaWikiServices;
/**
* Base class for language conversion.
@@ -47,7 +48,9 @@ class LanguageConverter {
];
public $mMainLanguageCode;
- public $mVariants, $mVariantFallbacks, $mVariantNames;
+ public $mVariants;
+ public $mVariantFallbacks;
+ public $mVariantNames;
public $mTablesLoaded = false;
public $mTables;
// 'bidirectional' 'unidirectional' 'disable' for each variant
@@ -550,8 +553,8 @@ class LanguageConverter {
$variant = $this->getPreferredVariant();
}
- $cache = ObjectCache::newAccelerator( CACHE_NONE );
- $key = wfMemcKey( 'languageconverter', 'namespace-text', $index, $variant );
+ $cache = MediaWikiServices::getInstance()->getLocalServerObjectCache();
+ $key = $cache->makeKey( 'languageconverter', 'namespace-text', $index, $variant );
$nsVariantText = $cache->get( $key );
if ( $nsVariantText !== false ) {
return $nsVariantText;
@@ -1086,11 +1089,11 @@ class LanguageConverter {
// -{zh-hans:xxx;zh-hant:\
// yyy;}-
// we should split it as:
- // array(
+ // [
// [0] => 'zh-hans:xxx'
// [1] => 'zh-hant:yyy'
// [2] => ''
- // )
+ // ]
$pat = '/;\s*(?=';
foreach ( $this->mVariants as $variant ) {
// zh-hans:xxx;zh-hant:yyy