Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fetchLanguageNames: fallback to default instead of false

Browse source 
In Language::fetchLanguageNames, fallback to the default option (mw) instead of returning false if none of the three options (all/mw/mwfile) is recognized

Change-Id: I743540bb0d1e7572a5a7e2f4ed9b57e7552d99b2
This commit is contained in:
robin 2012-05-10 01:39:11 +02:00
parent c87a63935a
commit aed0328558
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
languages/Language.php
View file

@ -700,9 +700,9 @@ class Language {
* Use null for autonyms (native names) * Use null for autonyms (native names)
* @param $include string: * @param $include string:
* 'all' all available languages * 'all' all available languages
* 'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames * 'mw' only if the language is defined in MediaWiki or wgExtraLanguageNames (default)
* 'mwfile' only if the language is in 'mw' *and* has a message file * 'mwfile' only if the language is in 'mw' *and* has a message file
* @return array|bool: language code => language name, false if $include is wrong * @return array: language code => language name
* @since 1.20 * @since 1.20
*/ */
public static function fetchLanguageNames( $inLanguage = null, $include = 'mw' ) { public static function fetchLanguageNames( $inLanguage = null, $include = 'mw' ) {
@ -740,9 +740,7 @@ class Language {
$returnMw[$coreCode] = $names[$coreCode]; $returnMw[$coreCode] = $names[$coreCode];
} }
if( $include === 'mw' ) { if( $include === 'mwfile' ) {
return $returnMw;
} elseif( $include === 'mwfile' ) {
$namesMwFile = array(); $namesMwFile = array();
# We do this using a foreach over the codes instead of a directory # We do this using a foreach over the codes instead of a directory
# loop so that messages files in extensions will work correctly. # loop so that messages files in extensions will work correctly.
@ -753,7 +751,8 @@ class Language {
} }
return $namesMwFile; return $namesMwFile;
} }
return false; # 'mw' option; default if it's not one of the other two options (all/mwfile)
return $returnMw;
} }
/** /**