From: Brian Wolff <bawolff+wn@gmail.com>
Date: Sun, 29 Jun 2014 21:45:07 +0000 (-0300)
Subject: Handle invalid language code gracefully in Language::fetchLanguageNames
X-Git-Tag: 1.31.0-rc.0~15004^2
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=634905558b2b2a658d55ee98b3200d9bd0731fe4;p=lhc%2Fweb%2Fwiklou.git

Handle invalid language code gracefully in Language::fetchLanguageNames

Core MW doesn't have a problem, but translate extension explodes.
Seems safer to just use 'en' if passed an invalid language code.

Bug: 60629
Change-Id: I0ede3169bb49001a1515ae5b2b6d28477704f346
---

diff --git a/languages/Language.php b/languages/Language.php
index bf30455169..f686a37479 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -857,6 +857,11 @@ class Language {
 			include "$IP/languages/Names.php";
 		}
 
+		// If passed an invalid language code to use, fallback to en
+		if ( $inLanguage !== null && !Language::isValidCode( $inLanguage ) ) {
+			$inLanguage = 'en';
+		}
+
 		$names = array();
 
 		if ( $inLanguage ) {