From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 30 May 2018 14:42:18 +0000 (+0000)
Subject: Merge "resourceloader: Remove use of $.params in mediawiki.js"
X-Git-Tag: 1.34.0-rc.0~5253
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=133332191dbca6e601531bd75a4fdcd6176e02b3;hp=7755a21ef3ab84ef424b859403436a4cef6fb9d4

Merge "resourceloader: Remove use of $.params in mediawiki.js"
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 2d3f6ad33f..b00cbffcb0 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1577,6 +1577,17 @@
 				}
 			}
 
+			/**
+			 * @private
+			 * @param {Object} params Map of parameter names to values
+			 * @return {string}
+			 */
+			function makeQueryString( params ) {
+				return Object.keys( params ).map( function ( key ) {
+					return encodeURIComponent( key ) + '=' + encodeURIComponent( params[ key ] );
+				} ).join( '&' );
+			}
+
 			/**
 			 * Create network requests for a batch of modules.
 			 *
@@ -1610,7 +1621,7 @@
 					// combining versions from the module query string in-order. (T188076)
 					query.version = getCombinedVersion( packed.list );
 					query = sortQuery( query );
-					addScript( sourceLoadScript + '?' + $.param( query ) );
+					addScript( sourceLoadScript + '?' + makeQueryString( query ) );
 				}
 
 				if ( !batch.length ) {
@@ -1666,7 +1677,7 @@
 						// > '&modules='.length === 9
 						// > '&version=1234567'.length === 16
 						// > 9 + 16 = 25
-						currReqBaseLength = $.param( currReqBase ).length + 25;
+						currReqBaseLength = makeQueryString( currReqBase ).length + 25;
 
 						// We may need to split up the request to honor the query string length limit,
 						// so build it piece by piece.