| Index: branches/wmf/1.18wmf1/extensions/ParserFunctions/ParserFunctions_body.php |
| — | — | @@ -505,7 +505,7 @@ |
| 506 | 506 | return '<strong class="error">' . wfMsgForContent( 'pfunc_time_too_long' ) . '</strong>'; |
| 507 | 507 | } else { |
| 508 | 508 | if ( $ts < 100000000000000 ) { // Language can't deal with years after 9999 |
| 509 | | - if ( Language::isValidBuiltInCode( $language ) ) { |
| | 509 | + if ( $language !== '' && Language::isValidBuiltInCode( $language ) ) { |
| 510 | 510 | // use whatever language is passed as a parameter |
| 511 | 511 | $langObject = Language::factory( $language ); |
| 512 | 512 | $result = $langObject->sprintfDate( $format, $ts ); |
| Property changes on: branches/wmf/1.18wmf1/extensions/ParserFunctions/ParserFunctions_body.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 513 | 513 | Merged /trunk/extensions/ParserFunctions/ParserFunctions_body.php:r92571-92572,96499,96502,96505,98278 |