Merge "Merge namespace aliases like we merge namespace names"

diff --git a/includes/cache/LocalisationCache.php b/includes/cache/LocalisationCache.php
index fad8ee8..83da4af 100644 (file)
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -38,7 +38,7 @@ use CLDRPluralRuleParser\Evaluator;
  * as grammatical transformation, is done by the caller.
  */
 class LocalisationCache {
-       const VERSION = 3;
+       const VERSION = 4;
 
        /** Configuration associative array */
        private $conf;
@@ -123,7 +123,7 @@ class LocalisationCache {
         * by a fallback sequence.
         */
        static public $mergeableMapKeys = array( 'messages', 'namespaceNames',
-               'dateFormats', 'imageFiles', 'preloadedMessages'
+               'namespaceAliases', 'dateFormats', 'imageFiles', 'preloadedMessages'
        );
 
        /**