| Index: trunk/phase3/languages/Language.php |
| — | — | @@ -1546,12 +1546,13 @@ |
| 1547 | 1547 | wfProfileIn( __METHOD__ ); |
| 1548 | 1548 | } |
| 1549 | 1549 | |
| | 1550 | + # Default fallback, may be overridden when the messages file is included |
| 1550 | 1551 | if ( $code != 'en' ) { |
| 1551 | 1552 | $fallback = 'en'; |
| 1552 | 1553 | } else { |
| 1553 | 1554 | $fallback = false; |
| 1554 | 1555 | } |
| 1555 | | - |
| | 1556 | + |
| 1556 | 1557 | # Load the primary localisation from the source file |
| 1557 | 1558 | $filename = self::getMessagesFileName( $code ); |
| 1558 | 1559 | if ( !file_exists( $filename ) ) { |
| — | — | @@ -1564,7 +1565,7 @@ |
| 1565 | 1566 | $cache = compact( self::$mLocalisationKeys ); |
| 1566 | 1567 | wfDebug( "Got localisation for $code from source\n" ); |
| 1567 | 1568 | } |
| 1568 | | - |
| | 1569 | + |
| 1569 | 1570 | if ( !empty( $fallback ) ) { |
| 1570 | 1571 | # Load the fallback localisation, with a circular reference guard |
| 1571 | 1572 | if ( isset( $recursionGuard[$code] ) ) { |