Merge namespace aliases like we merge namespace names

To avoid problems like T60074 and deal with requests like T101634.

Bug: T108427
Change-Id: I3ef6bbcc820a254b44ba86bfccb3854983a19ff6

diff --git a/includes/cache/LocalisationCache.php b/includes/cache/LocalisationCache.php
index 276e84a..67e5ae8 100644 (file)
--- a/includes/cache/LocalisationCache.php
+++ b/includes/cache/LocalisationCache.php
@@ -37,7 +37,7 @@ use Cdb\Writer as CdbWriter;
  * as grammatical transformation, is done by the caller.
  */
 class LocalisationCache {
-       const VERSION = 3;
+       const VERSION = 4;
 
        /** Configuration associative array */
        private $conf;
@@ -122,7 +122,7 @@ class LocalisationCache {
         * by a fallback sequence.
         */
        static public $mergeableMapKeys = array( 'messages', 'namespaceNames',
-               'dateFormats', 'imageFiles', 'preloadedMessages'
+               'namespaceAliases', 'dateFormats', 'imageFiles', 'preloadedMessages'
        );
 
        /**