From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 27 Jul 2006 10:12:59 +0000 (+0000)
Subject: Added magicWords to mergeable map keys, touched MessagesEn.php to invalidate caches
X-Git-Tag: 1.31.0-rc.0~56133
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=a22cb111010cc5b19b3022f791ab90b62e7a52d9;p=lhc%2Fweb%2Fwiklou.git

Added magicWords to mergeable map keys, touched MessagesEn.php to invalidate caches
---

diff --git a/languages/Language.php b/languages/Language.php
index 990fed5e28..b4de4a1e0b 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -70,7 +70,7 @@ class Language {
 		'defaultDateFormat', 'extraUserToggles' );
 
 	static public $mMergeableMapKeys = array( 'messages', 'namespaceNames', 'mathNames', 
-		'dateFormats', 'defaultUserOptionOverrides' );
+		'dateFormats', 'defaultUserOptionOverrides', 'magicWords' );
 
 	static public $mMergeableListKeys = array( 'extraUserToggles' );
 
diff --git a/languages/MessagesEn.php b/languages/MessagesEn.php
index df91e71a49..0013d4fb9a 100644
--- a/languages/MessagesEn.php
+++ b/languages/MessagesEn.php
@@ -1,4 +1,8 @@
 <?php
+/**
+ * This is the default English localisation file
+ */
+
 
 /**
  * Fallback language, used for all unspecified messages and behaviour. This