From: Timo Tijhof <krinklemail@gmail.com>
Date: Sun, 31 May 2015 18:19:34 +0000 (+0100)
Subject: resourceloader: Fix broken 'version' param in mw.loader requests
X-Git-Tag: 1.31.0-rc.0~11247
X-Git-Url: http://git.cyclocoop.org//%22%22.url_de_base%28%29.%22/%22?a=commitdiff_plain;h=c5d6521d8f31180994eb7cf4b83efeae5b2afbc3;p=lhc%2Fweb%2Fwiklou.git

resourceloader: Fix broken 'version' param in mw.loader requests

All requests were using version=da39a3ee5e6b, where da39a3ee5e6b
is the sha1() of the empty string.

Follows-up f37cee996e which incorrectly assummed the local
'modules' variable to hold a list of objects, when in fact it
holds a list of strings.

Change-Id: I717b8657300263606832ff1ec67a34a7163de842
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index f2b4b00549..0c2472092d 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -900,12 +900,12 @@
 
 			/**
 			 * @since 1.26
-			 * @param {Object[]} modules List of module registry objects
+			 * @param {Array} modules List of module names
 			 * @return {string} Hash of concatenated version hashes.
 			 */
 			function getCombinedVersion( modules ) {
 				var hashes = $.map( modules, function ( module ) {
-					return module.version;
+					return registry[module].version;
 				} );
 				// Trim for consistency with server-side ResourceLoader::makeHash. It also helps
 				// save precious space in the limited query string. Otherwise modules are more