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

(Also ping r81731)

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 29f3d09..2837913 100644 (file)
--- 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 );
        }
 
        /**