| Index: branches/wmf/1.18wmf1/includes/resourceloader/ResourceLoaderFileModule.php |
| — | — | @@ -150,10 +150,10 @@ |
| 151 | 151 | { |
| 152 | 152 | global $IP, $wgScriptPath, $wgResourceBasePath; |
| 153 | 153 | $this->localBasePath = $localBasePath === null ? $IP : $localBasePath; |
| 154 | | - if ( $wgResourceBasePath !== null ) { |
| 155 | | - $this->remoteBasePath = $wgResourceBasePath; |
| | 154 | + if ( $remoteBasePath !== null ) { |
| | 155 | + $this->remoteBasePath = $remoteBasePath; |
| 156 | 156 | } else { |
| 157 | | - $this->remoteBasePath = $remoteBasePath === null ? $wgScriptPath : $remoteBasePath; |
| | 157 | + $this->remoteBasePath = $wgResourceBasePath === null ? $wgScriptPath : $wgResourceBasePath; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | if ( isset( $options['remoteExtPath'] ) ) { |