| Index: trunk/phase3/includes/resourceloader/ResourceLoaderFileModule.php |
| — | — | @@ -148,9 +148,13 @@ |
| 149 | 149 | public function __construct( $options = array(), $localBasePath = null, |
| 150 | 150 | $remoteBasePath = null ) |
| 151 | 151 | { |
| 152 | | - global $IP, $wgScriptPath; |
| | 152 | + global $IP, $wgScriptPath, $wgResourceBasePath; |
| 153 | 153 | $this->localBasePath = $localBasePath === null ? $IP : $localBasePath; |
| 154 | | - $this->remoteBasePath = $remoteBasePath === null ? $wgScriptPath : $remoteBasePath; |
| | 154 | + if ( $remoteBasePath !== null ) { |
| | 155 | + $this->remoteBasePath = $remoteBasePath; |
| | 156 | + } else { |
| | 157 | + $this->remoteBasePath = $wgResourceBasePath === null ? $wgScriptPath : $wgResourceBasePath; |
| | 158 | + } |
| 155 | 159 | |
| 156 | 160 | if ( isset( $options['remoteExtPath'] ) ) { |
| 157 | 161 | global $wgExtensionAssetsPath; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1381,6 +1381,7 @@ |
| 1382 | 1382 | * |
| 1383 | 1383 | * $wgDefaultExternalStore = array( 'DB://cluster1', 'DB://cluster2' ); |
| 1384 | 1384 | * |
| | 1385 | + * @var array |
| 1385 | 1386 | */ |
| 1386 | 1387 | $wgDefaultExternalStore = false; |
| 1387 | 1388 | |
| — | — | @@ -2487,6 +2488,12 @@ |
| 2488 | 2489 | */ |
| 2489 | 2490 | $wgResourceLoaderSources = array(); |
| 2490 | 2491 | |
| | 2492 | +/* |
| | 2493 | + * Default 'remoteBasePath' value for resource loader modules. |
| | 2494 | + * If not set, then $wgScriptPath will be used as a fallback. |
| | 2495 | + */ |
| | 2496 | +$wgResourceBasePath = null; |
| | 2497 | + |
| 2491 | 2498 | /** |
| 2492 | 2499 | * Maximum time in seconds to cache resources served by the resource loader |
| 2493 | 2500 | */ |