From b381dc161ed11c8e61409f23b96fd5ca72b2fdca Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sat, 2 Apr 2016 00:22:29 +0100 Subject: [PATCH] resourceloader: Remove wfExpandUrl() from ResourceLoaderImage Follows-up b5e69c4ef which did the same for already for ResourceLoader.php. There's no need to expand the hostname into these urls. If load.php is on the same domain (e.g. set to '/w/load.php') then this can be resolved by the browser normally. If load.php is on a custom domain, the stylesheet would be served from there instead of from the wiki domain. However in that case the hostname would already be part of $script value ($wgLoadScript). Bug: T125292 Change-Id: I7242445335d69d7ae290da5f321a59edd537d819 --- includes/resourceloader/ResourceLoaderImage.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/includes/resourceloader/ResourceLoaderImage.php b/includes/resourceloader/ResourceLoaderImage.php index f784d0346c..87e5fd7b82 100644 --- a/includes/resourceloader/ResourceLoaderImage.php +++ b/includes/resourceloader/ResourceLoaderImage.php @@ -179,7 +179,7 @@ class ResourceLoaderImage { 'version' => $context->getVersion(), ]; - return wfExpandUrl( wfAppendQuery( $script, $query ), PROTO_RELATIVE ); + return wfAppendQuery( $script, $query ); } /** -- 2.20.1