From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 29 Sep 2016 02:58:57 +0000 (-0700)
Subject: Convert LanguageConverter to using getLocalServerObjectCache()
X-Git-Tag: 1.31.0-rc.0~5141^2
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/gestion/rappel_supprimer.php?a=commitdiff_plain;h=0809631edde1a74664a34259a3890ede1f1278fc;p=lhc%2Fweb%2Fwiklou.git

Convert LanguageConverter to using getLocalServerObjectCache()

Change-Id: I7bfcc389ef0266299d887a3520ab9581ef9aa9be
---

diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 13ba7e84b7..1c003adb4b 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -18,6 +18,7 @@
  * @file
  * @ingroup Language
  */
+use MediaWiki\MediaWikiServices;
 
 /**
  * Base class for language conversion.
@@ -550,8 +551,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;