From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 Sep 2015 23:25:38 +0000 (+0000)
Subject: Merge "resourceloader: Don't call wfExpandUrl() on load.php urls"
X-Git-Tag: 1.31.0-rc.0~10014
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=3a3c3e73e72f25e650480b7083b194d05d9e1bad;hp=f8659ae6ea90d7bc8ce28bfc1caa56153878836f

Merge "resourceloader: Don't call wfExpandUrl() on load.php urls"
---

diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index b8ec63bb29..da74b35280 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1485,7 +1485,7 @@ MESSAGE;
 		$query = self::createLoaderQuery( $context, $extraQuery );
 		$script = $this->getLoadScript( $source );
 
-		return wfExpandUrl( wfAppendQuery( $script, $query ), PROTO_RELATIVE );
+		return wfAppendQuery( $script, $query );
 	}
 
 	/**
@@ -1513,7 +1513,7 @@ MESSAGE;
 			$only, $printable, $handheld, $extraQuery
 		);
 
-		return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ), PROTO_RELATIVE );
+		return wfAppendQuery( $wgLoadScript, $query );
 	}
 
 	/**