From 1e21dd285868e88dd9451ad88cfebaffed74f284 Mon Sep 17 00:00:00 2001 From: "Mark A. Hershberger" Date: Mon, 30 Jan 2012 23:07:08 +0000 Subject: [PATCH] Fixes bug 34036 - [regression] mw.loader.load doesn't works as importScriptURI for some kinds of URLs Patch from Helder.wiki --- resources/mediawiki/mediawiki.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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( $( '', { rel: 'stylesheet', -- 2.20.1