From a79519af53f8b129232d51487fe2a8cf94f95738 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 7 Jun 2018 17:57:10 -0700
Subject: [PATCH] resourceloader: qualify $ variable in script() call to handle
 the case of jQuery

Bug: T192623
Change-Id: Id3016dfdc32bff5b5437bf5961cde8d9f6047150
---
 resources/src/mediawiki/mediawiki.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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' ) {
-- 
2.20.1