| Index: trunk/phase3/includes/MessageCache.php |
| — | — | @@ -695,14 +695,16 @@ |
| 696 | 696 | * Load messages from a given file |
| 697 | 697 | */ |
| 698 | 698 | function loadMessagesFile( $filename ) { |
| 699 | | - $magicWords = false; |
| | 699 | + $messages = $magicWords = false; |
| 700 | 700 | require( $filename ); |
| 701 | | - $this->addMessagesByLang( $messages ); |
| 702 | 701 | |
| | 702 | + if ( $messages !== false ) { |
| | 703 | + $this->addMessagesByLang( $messages ); |
| | 704 | + } |
| | 705 | + |
| 703 | 706 | if ( $magicWords !== false ) { |
| 704 | 707 | global $wgContLang; |
| 705 | 708 | $wgContLang->addMagicWordsByLang( $magicWords ); |
| 706 | 709 | } |
| 707 | 710 | } |
| 708 | 711 | } |
| 709 | | - |