jenkins-bot has submitted this change and it was merged.
Change subject: Handle invalid language code gracefully in
Language::fetchLanguageNames
......................................................................
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
---
M languages/Language.php
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/languages/Language.php b/languages/Language.php
index bf30455..f686a37 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -857,6 +857,11 @@
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 ) {
--
To view, visit https://gerrit.wikimedia.org/r/142974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0ede3169bb49001a1515ae5b2b6d28477704f346
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff <[email protected]>
Gerrit-Reviewer: Brian Wolff <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
