From: This, that and the other <at.light@live.com.au>
Date: Tue, 15 Dec 2015 05:53:28 +0000 (+1100)
Subject: Merge namespace aliases like we merge namespace names
X-Git-Tag: 1.31.0-rc.0~8644^2
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=1783ae651cc0947f0df5a485930aebead4804678

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 276e84aaa9..67e5ae88de 100644
--- 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'
 	);
 
 	/**