From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sat, 29 May 2004 01:41:00 +0000 (+0000)
Subject: Fixed bug with magic word fallback to en
X-Git-Tag: 1.5.0alpha1~3166
X-Git-Url: http://git.cyclocoop.org/wiki/Target_page?a=commitdiff_plain;h=87e6a24dcbe2d84aab9a1db0d6d7fb401dee1e24;p=lhc%2Fweb%2Fwiklou.git

Fixed bug with magic word fallback to en
---

diff --git a/languages/Language.php b/languages/Language.php
index 90c6ec1482..9ccfd5a419 100644
--- 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 eb548289a9..5c773e55d0 100644
--- 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()