From: Fomafix <fomafix@googlemail.com>
Date: Sat, 29 Jun 2019 07:47:57 +0000 (+0200)
Subject: resourceloader: Set value for getStoreKey in server-side
X-Git-Tag: 1.34.0-rc.0~1169^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=30ddfc8a77214cd9df75293f7d7ab008d1afad87;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Set value for getStoreKey in server-side

This change reduces the size of the JavaScript resources.

Change-Id: I850249f910f6275c1b963dc5421ba706ed6e9a56
---

diff --git a/includes/resourceloader/ResourceLoaderStartUpModule.php b/includes/resourceloader/ResourceLoaderStartUpModule.php
index 41e66effd4..7880f6f249 100644
--- a/includes/resourceloader/ResourceLoaderStartUpModule.php
+++ b/includes/resourceloader/ResourceLoaderStartUpModule.php
@@ -366,6 +366,16 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 		return $baseModules;
 	}
 
+	/**
+	 * Get the localStorage key for the entire module store. The key references
+	 * $wgDBname to prevent clashes between wikis under the same web domain.
+	 *
+	 * @return string localStorage item key for JavaScript
+	 */
+	private function getStoreKey() {
+		return 'MediaWikiModuleStore:' . $this->getConfig()->get( 'DBname' );
+	}
+
 	/**
 	 * Get the key on which the JavaScript module cache (mw.loader.store) will vary.
 	 *
@@ -412,6 +422,7 @@ class ResourceLoaderStartUpModule extends ResourceLoaderModule {
 			'$VARS.maxQueryLength' => ResourceLoader::encodeJsonForScript(
 				$conf->get( 'ResourceLoaderMaxQueryLength' )
 			),
+			'$VARS.storeKey' => ResourceLoader::encodeJsonForScript( $this->getStoreKey() ),
 			'$VARS.storeVary' => ResourceLoader::encodeJsonForScript( $this->getStoreVary( $context ) ),
 		];
 		$profilerStubs = [
diff --git a/resources/src/startup/mediawiki.js b/resources/src/startup/mediawiki.js
index 1583445eb1..e77555c16e 100644
--- a/resources/src/startup/mediawiki.js
+++ b/resources/src/startup/mediawiki.js
@@ -2161,7 +2161,7 @@
 					 * @return {string} localStorage item key
 					 */
 					getStoreKey: function () {
-						return 'MediaWikiModuleStore:' + mw.config.get( 'wgDBname' );
+						return $VARS.storeKey;
 					},
 
 					/**