r82039 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r82038‎ | r82039 | r82040 >
Date:23:20, 12 February 2011
Author:krinkle
Status:ok
Tags:
Comment:
Follow-up r82038. Calling wfExpandUrl() on remote base path *AFTER* is has been set in the foreach loop.

(Also ping r81731)
Modified paths:
  • /trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php
@@ -150,7 +150,6 @@
151151 global $wgExtensionAssetsPath;
152152 $this->remoteBasePath = $wgExtensionAssetsPath . '/' . $options['remoteExtPath'];
153153 }
154 - $this->remoteBasePath = wfExpandUrl( $this->remoteBasePath );
155154
156155 foreach ( $options as $member => $option ) {
157156 switch ( $member ) {
@@ -198,6 +197,8 @@
199198 break;
200199 }
201200 }
 201+ // Make sure the remote base path is a complete valid url
 202+ $this->remoteBasePath = wfExpandUrl( $this->remoteBasePath );
202203 }
203204
204205 /**

Follow-up revisions

RevisionCommit summaryAuthorDate
r820411.17wmf1: MFT r82038, r82039catrope23:24, 12 February 2011
r85151MFT: r82000, r82004, r82020, r82025, r82038, r82039, r82048, r82070, r82081, ...demon20:39, 1 April 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r81731Remove $wgServer prepending from remote JS/CSS paths. It's not needed and bre...catrope12:34, 8 February 2011
r82038Follow-up r81731 CR comments. Calling wfExpandUrl() on remote base path.krinkle22:46, 12 February 2011

Status & tagging log