diff options
| author | Tim Starling <tstarling@wikimedia.org> | 2021-02-24 12:13:22 +1100 |
|---|---|---|
| committer | Krinkle <krinklemail@gmail.com> | 2021-02-24 05:27:55 +0000 |
| commit | e2a91921c5bd951873a524ed9c085408881d4363 (patch) | |
| tree | cd04659bbdd3f4c9615e9a215c9fa3033a6eec25 /includes/resourceloader/ResourceLoaderFileModule.php | |
| parent | bcba94d420f09bea33fd8ca4b561390d45f9e686 (diff) | |
| download | mediawikicore-e2a91921c5bd951873a524ed9c085408881d4363.tar.gz mediawikicore-e2a91921c5bd951873a524ed9c085408881d4363.zip | |
resourceloader: Fix FileModule resource URLs for document root wikis
Per the comment in extractBasePaths(), remoteBasePath is typically '/'
when MediaWiki is installed in the document root. CSSMin knows what to
do with that, but getRemotePath() was getting it wrong, generating an
invalid protocol-relative URL.
So, add a simple hack for this case.
Change-Id: I16abf482e3a1a4a548c571de0e81cb3c1bdf55e1
Diffstat (limited to 'includes/resourceloader/ResourceLoaderFileModule.php')
| -rw-r--r-- | includes/resourceloader/ResourceLoaderFileModule.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index a9c67c7046a5..ff71bebe555a 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -701,7 +701,11 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { return $path->getRemotePath(); } - return "{$this->remoteBasePath}/$path"; + if ( $this->remoteBasePath === '/' ) { + return "/$path"; + } else { + return "{$this->remoteBasePath}/$path"; + } } /** |