From 634905558b2b2a658d55ee98b3200d9bd0731fe4 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Sun, 29 Jun 2014 18:45:07 -0300 Subject: [PATCH] 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 --- languages/Language.php | 5 +++++ 1 file changed, 5 insertions(+) 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 ) { -- 2.20.1