From: Tim Starling <tstarling@users.mediawiki.org>
Date: Sun, 20 Jun 2004 12:13:53 +0000 (+0000)
Subject: combine magic word array with English one
X-Git-Tag: 1.5.0alpha1~2809
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=7faa685abf91d039ab3c7f1280086791eb58cb5c;p=lhc%2Fweb%2Fwiklou.git

combine magic word array with English one
---

diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 43baf50a5a..92cdcc82c1 100644
--- a/languages/LanguageCy.php
+++ b/languages/LanguageCy.php
@@ -1131,10 +1131,11 @@ class LanguageCy extends LanguageUtf8 {
 
 	function getMagicWords() 
 	{
-		global $wgMagicWordsCy;
-		return $wgMagicWordsCy;
+		global $wgMagicWordsCy, $wgMagicWordsEn;
+		return $wgMagicWordsCy + $wgMagicWordsEn;
 	}
 
+
 }
 
 ?>