From: Fomafix <fomafix@googlemail.com>
Date: Mon, 9 Jul 2018 04:26:57 +0000 (+0200)
Subject: Use Language::equals to compare Language objects
X-Git-Tag: 1.34.0-rc.0~4833^2
X-Git-Url: http://git.cyclocoop.org/%22.htmlspecialchars%28%24url_syndic%29.%22?a=commitdiff_plain;h=9926033b4fe136b558159302c7664e558db48753;p=lhc%2Fweb%2Fwiklou.git

Use Language::equals to compare Language objects

With I8a47a8500922906bd4e4936b59b657de3bb9abdc Language::equals can
directly and faster compare the objects.

$wgLanguageCode can differ from $wgContLang->getCode() when a deprecated
language code is used. This change prevents this because Language
replaces deprecated language codes in Language::factory().

Change-Id: I07f47eceff8b3a4192278b1e9e1cfd9a41816a1c
---

diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index 7ae2ee0e21..f8cd754a06 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -91,6 +91,7 @@ class HTMLFileCache extends FileCacheBase {
 	 * @return bool
 	 */
 	public static function useFileCache( IContextSource $context, $mode = self::MODE_NORMAL ) {
+		global $wgContLang;
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 
 		if ( !$config->get( 'UseFileCache' ) && $mode !== self::MODE_REBUILD ) {
@@ -123,7 +124,7 @@ class HTMLFileCache extends FileCacheBase {
 		$ulang = $context->getLanguage();
 
 		// Check that there are no other sources of variation
-		if ( $user->getId() || $ulang->getCode() !== $config->get( 'LanguageCode' ) ) {
+		if ( $user->getId() || !$ulang->equals( $wgContLang ) ) {
 			return false;
 		}