https://www.mediawiki.org/wiki/Special:Code/MediaWiki/111452
Revision: 111452 Author: tstarling Date: 2012-02-14 09:25:42 +0000 (Tue, 14 Feb 2012) Log Message: ----------- Fix exception like in trunk r111349, simplified for easier merging Modified Paths: -------------- branches/REL1_19/extensions/cldr/LanguageNames.body.php Modified: branches/REL1_19/extensions/cldr/LanguageNames.body.php =================================================================== --- branches/REL1_19/extensions/cldr/LanguageNames.body.php 2012-02-14 09:17:12 UTC (rev 111451) +++ branches/REL1_19/extensions/cldr/LanguageNames.body.php 2012-02-14 09:25:42 UTC (rev 111452) @@ -84,6 +84,10 @@ */ private static function loadLanguage( $code ) { if ( !isset( self::$cache[$code] ) ) { + if ( !Language::isValidBuiltInCode( $code ) ) { + return array(); + } + wfProfileIn( __METHOD__ . '-recache' ); /* Load override for wrong or missing entries in cldr */ _______________________________________________ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs