r111452 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:< r111451‎ | r111452 | r111453 >
Date:09:25, 14 February 2012
Author:tstarling
Status:ok (Comments)
Tags:
Comment:
Fix exception like in trunk r111349, simplified for easier merging
Modified paths:
  • /branches/REL1_19/extensions/cldr/LanguageNames.body.php (modified) (history)

Diff [purge]

Index: branches/REL1_19/extensions/cldr/LanguageNames.body.php
——@@ -84,6 +84,10 @@
8585 */
8686 private static function loadLanguage( $code ) {
8787 if ( !isset( self::$cache[$code] ) ) {
 88+ if ( !Language::isValidBuiltInCode( $code ) ) {
 89+ return array();
 90+ }
 91+
8892 wfProfileIn( __METHOD__ . '-recache' );
8993
9094 /* Load override for wrong or missing entries in cldr */

Follow-up revisions

RevisionCommit summaryAuthorDate
r111453Merged r111452 from 1.19, equivalent to trunk r111451tstarling09:27, 14 February 2012
r111454Merged r111452 from 1.19tstarling09:35, 14 February 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r111451* Fixed an exception generated with {{#language:<nowiki>xx</nowiki>}} due to ...tstarling09:17, 14 February 2012

Comments

#Comment by Tim Starling (talk | contribs)   09:37, 14 February 2012

Commit message should read "like in trunk r111451".

Status & tagging log