From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Mon, 30 Jan 2012 23:07:08 +0000 (+0000)
Subject: Fixes bug 34036 - [regression] mw.loader.load doesn't works as importScriptURI for... 
X-Git-Tag: 1.31.0-rc.0~24997
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=1e21dd285868e88dd9451ad88cfebaffed74f284;p=lhc%2Fweb%2Fwiklou.git

Fixes bug 34036 - [regression] mw.loader.load doesn't works as importScriptURI for some kinds of URLs
Patch from Helder.wiki
---

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 585483b764..0dce50ed93 100644
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -1137,7 +1137,7 @@ var mw = ( function ( $, undefined ) {
 				 *  "text/javascript"; if no type is provided, text/javascript is assumed.
 				 */
 				load: function ( modules, type ) {
-					var filtered, m;
+					var filtered, m, reValidURL;
 
 					// Validate input
 					if ( typeof modules !== 'object' && typeof modules !== 'string' ) {
@@ -1146,7 +1146,8 @@ var mw = ( function ( $, undefined ) {
 					// Allow calling with an external url or single dependency as a string
 					if ( typeof modules === 'string' ) {
 						// Support adding arbitrary external scripts
-						if ( /^(https?:)?\/\//.test( modules ) ) {
+						reValidURL = new RegExp( '^((https?:)?\\/\\/|' + $.escapeRE( mw.config.get( 'wgScript' ) ) + ')' );
+						if ( reValidURL.test( modules ) ) {
 							if ( type === 'text/css' ) {
 								$( 'head' ).append( $( '<link>', {
 									rel: 'stylesheet',