X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=languages%2FLanguage.php;h=69f518b33e1366049d8a892292afd7d437ff16aa;hb=e5769850d8af84e45e9365928f251f87fc575fdc;hp=c7871c1bd2b8c9b1b28ac6bac8affd4cde67aa61;hpb=5def88354828f40548a6330077064876b5dbd1a8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/languages/Language.php b/languages/Language.php
index c7871c1bd2..69f518b33e 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 );
 		}
@@ -4451,12 +4451,11 @@ class Language {
 	 * @return bool|string
 	 */
 	public static function getFallbackFor( $code ) {
-		if ( $code === 'en' || !Language::isValidBuiltInCode( $code ) ) {
-			return false;
-		} else {
-			$fallbacks = self::getFallbacksFor( $code );
+		$fallbacks = self::getFallbacksFor( $code );
+		if ( $fallbacks ) {
 			return $fallbacks[0];
 		}
+		return false;
 	}
 
 	/**