From 5a9e8620637439c8b6a29e5747afc7cb4cb7ced3 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Mon, 9 Nov 2015 23:29:07 +0000
Subject: [PATCH] Language: Convert names cache from MapCacheLRU to
 HashBagOStuff

Change-Id: I3237c8ed97d23e82caa171d936ecb5745a2fe3d5
---
 languages/Language.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/languages/Language.php b/languages/Language.php
index c7871c1bd2..77471981ee 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -147,7 +147,7 @@ class Language {
 
 	/**
 	 * Cache for language names
-	 * @var MapCacheLRU|null
+	 * @var HashBagOStuff|null
 	 */
 	static private $languageNameCache;
 
@@ -851,11 +851,11 @@ class Language {
 		$cacheKey = $inLanguage === null ? 'null' : $inLanguage;
 		$cacheKey .= ":$include";
 		if ( self::$languageNameCache === null ) {
-			self::$languageNameCache = new MapCacheLRU( 20 );
+			self::$languageNameCache = new HashBagOStuff( array( 'maxKeys' => 20 ) );
 		}
-		if ( self::$languageNameCache->has( $cacheKey ) ) {
-			$ret = self::$languageNameCache->get( $cacheKey );
-		} else {
+
+		$ret = self::$languageNameCache->get( $cacheKey );
+		if ( !$ret ) {
 			$ret = self::fetchLanguageNamesUncached( $inLanguage, $include );
 			self::$languageNameCache->set( $cacheKey, $ret );
 		}
-- 
2.20.1