http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97775
Revision: 97775
Author: aaron
Date: 2011-09-22 00:38:25 +0000 (Thu, 22 Sep 2011)
Log Message:
-----------
Fixed wtf from r97771
Modified Paths:
--------------
branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php
Modified:
branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php
===================================================================
--- branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php
2011-09-22 00:35:55 UTC (rev 97774)
+++ branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php
2011-09-22 00:38:25 UTC (rev 97775)
@@ -150,10 +150,10 @@
{
global $IP, $wgScriptPath, $wgResourceBasePath;
$this->localBasePath = $localBasePath === null ? $IP :
$localBasePath;
- if ( $wgResourceBasePath !== null ) {
- $this->remoteBasePath = $wgResourceBasePath;
+ if ( $remoteBasePath !== null ) {
+ $this->remoteBasePath = $remoteBasePath;
} else {
- $this->remoteBasePath = $remoteBasePath === null ?
$wgScriptPath : $remoteBasePath;
+ $this->remoteBasePath = $wgResourceBasePath === null ?
$wgScriptPath : $wgResourceBasePath;
}
if ( isset( $options['remoteExtPath'] ) ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
