dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87609ef
)
Handle invalid language code gracefully in Language::fetchLanguageNames
author
Brian Wolff
<bawolff+wn@gmail.com>
Sun, 29 Jun 2014 21:45:07 +0000
(18:45 -0300)
committer
Brian Wolff
<bawolff+wn@gmail.com>
Mon, 30 Jun 2014 20:52:03 +0000
(17:52 -0300)
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
patch
|
blob
|
history
diff --git
a/languages/Language.php
b/languages/Language.php
index
bf30455
..
f686a37
100644
(file)
--- 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 ) {