| Index: branches/wmf/1.19wmf1/extensions/cldr/LanguageNames.body.php |
| — | — | @@ -84,6 +84,10 @@ |
| 85 | 85 | */ |
| 86 | 86 | private static function loadLanguage( $code ) { |
| 87 | 87 | if ( !isset( self::$cache[$code] ) ) { |
| | 88 | + if ( !Language::isValidBuiltInCode( $code ) ) { |
| | 89 | + return array(); |
| | 90 | + } |
| | 91 | + |
| 88 | 92 | wfProfileIn( __METHOD__ . '-recache' ); |
| 89 | 93 | |
| 90 | 94 | /* Load override for wrong or missing entries in cldr */ |
| Property changes on: branches/wmf/1.19wmf1/extensions/cldr/LanguageNames.body.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 91 | 95 | Merged /branches/sqlite/extensions/cldr/LanguageNames.body.php:r58211-58321 |
| 92 | 96 | Merged /trunk/phase3/extensions/cldr/LanguageNames.body.php:r111002,111029,111034,111062,111067,111076,111085,111128,111144,111251 |
| 93 | 97 | Merged /branches/new-installer/phase3/extensions/cldr/LanguageNames.body.php:r43664-66004 |
| 94 | 98 | Merged /branches/JSTesting/extensions/cldr/LanguageNames.body.php:r100352-107913 |
| 95 | 99 | Merged /branches/REL1_15/phase3/extensions/cldr/LanguageNames.body.php:r51646 |
| 96 | 100 | Merged /branches/wmf/1.18wmf1/extensions/cldr/LanguageNames.body.php:r97508 |
| 97 | 101 | Merged /branches/REL1_19/extensions/cldr/LanguageNames.body.php:r111452 |
| 98 | 102 | Merged /branches/REL1_17/phase3/extensions/cldr/LanguageNames.body.php:r81445,81448 |
| 99 | 103 | Merged /trunk/extensions/cldr/LanguageNames.body.php:r111199,111218 |