From: Krinkle <krinkle@users.mediawiki.org>
Date: Sat, 12 Feb 2011 23:20:32 +0000 (+0000)
Subject: Follow-up r82038. Calling wfExpandUrl() on remote base path *AFTER* is has been set... 
X-Git-Tag: 1.31.0-rc.0~32015
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=4c0ddd464f2744f6242429c80986a957c7e8c439;p=lhc%2Fweb%2Fwiklou.git

Follow-up r82038. Calling wfExpandUrl() on remote base path *AFTER* is has been set in the foreach loop.

(Also ping r81731)
---

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 29f3d0997c..2837913985 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -150,7 +150,6 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			global $wgExtensionAssetsPath;
 			$this->remoteBasePath = $wgExtensionAssetsPath . '/' . $options['remoteExtPath'];
 		}
-		$this->remoteBasePath = wfExpandUrl( $this->remoteBasePath );
 
 		foreach ( $options as $member => $option ) {
 			switch ( $member ) {
@@ -198,6 +197,8 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 					break;
 			}
 		}
+		// Make sure the remote base path is a complete valid url
+		$this->remoteBasePath = wfExpandUrl( $this->remoteBasePath );
 	}
 
 	/**