From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 8 Jun 2018 00:57:10 +0000 (-0700)
Subject: resourceloader: qualify $ variable in script() call to handle the case of jQuery
X-Git-Tag: 1.34.0-rc.0~5038^2
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=a79519af53f8b129232d51487fe2a8cf94f95738;p=lhc%2Fweb%2Fwiklou.git

resourceloader: qualify $ variable in script() call to handle the case of jQuery

Bug: T192623
Change-Id: Id3016dfdc32bff5b5437bf5961cde8d9f6047150
---

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index ad020b5635..4ce6ff86fb 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1081,7 +1081,7 @@
 						} else if ( typeof script === 'function' ) {
 							// Pass jQuery twice so that the signature of the closure which wraps
 							// the script can bind both '$' and 'jQuery'.
-							script( $, $, mw.loader.require, registry[ module ].module );
+							script( window.$, window.$, mw.loader.require, registry[ module ].module );
 							markModuleReady();
 
 						} else if ( typeof script === 'string' ) {