aboutsummaryrefslogtreecommitdiffstats
path: root/languages/LanguageCy.php
diff options
context:
space:
mode:
authorTim Starling <tstarling@users.mediawiki.org>2004-06-20 12:13:53 +0000
committerTim Starling <tstarling@users.mediawiki.org>2004-06-20 12:13:53 +0000
commit7faa685abf91d039ab3c7f1280086791eb58cb5c (patch)
tree923006d650967ec7c6de2413a17b16ed20456eb6 /languages/LanguageCy.php
parentea0b42a546dd69f9e666f4e4bb83f7a22f005e62 (diff)
downloadmediawikicore-7faa685abf91d039ab3c7f1280086791eb58cb5c.tar.gz
mediawikicore-7faa685abf91d039ab3c7f1280086791eb58cb5c.zip
combine magic word array with English one
Notes
Notes: http://mediawiki.org/wiki/Special:Code/MediaWiki/4124
Diffstat (limited to 'languages/LanguageCy.php')
-rw-r--r--languages/LanguageCy.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/languages/LanguageCy.php b/languages/LanguageCy.php
index 43baf50a5a52..92cdcc82c1ce 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;
}
+
}
?>