Fixed bug with magic word fallback to en

diff --git a/languages/Language.php b/languages/Language.php
index 90c6ec1..9ccfd5a 100644 (file)
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1770,7 +1770,7 @@ class Language {
        function getMessage( $key )
        {
                global $wgAllMessagesEn;
-               return $wgAllMessagesEn[$key];
+               return @$wgAllMessagesEn[$key];
        }
        
        function getAllMessages()
@@ -1877,7 +1877,7 @@ class Language {
        function getMagic( &$mw )
        {
                $raw =& $this->getMagicWords(); 
-               if( !isset( $raw[$mw->mld] ) ) {
+               if( !isset( $raw[$mw->mId] ) ) {
                        # Fall back to English if local list is incomplete
                        $raw =& Language::getMagicWords();
                }

diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index eb54828..5c773e5 100644 (file)
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -1119,7 +1119,7 @@ class LanguageCy extends LanguageUtf8 {
        function getMessage( $key )
        {
                global $wgAllMessagesCy;
-               return $wgAllMessagesCy[$key];
+               return @$wgAllMessagesCy[$key];
        }
        
        function getAllMessages()