From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Fri, 30 Sep 2011 10:14:39 +0000 (+0000)
Subject: Address fixme on r96978: expand URLs fed to the client-side loader
X-Git-Tag: 1.31.0-rc.0~27348
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=2b05b95a6d35e7149210923a2a2f158c2a6c5f59;p=lhc%2Fweb%2Fwiklou.git

Address fixme on r96978: expand URLs fed to the client-side loader
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index d703264336..716d470f97 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -891,7 +891,7 @@ class ResourceLoader {
 		
 		// Prevent the IE6 extension check from being triggered (bug 28840)
 		// by appending a character that's invalid in Windows extensions ('*')
-		return wfAppendQuery( $wgLoadScript, $query ) . '&*';
+		return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ) . '&*', PROTO_RELATIVE );
 	}
 
 	/**