Skip to content

Commit

Permalink
Fix resolving assets on Windows in sub directory (#4482)
Browse files Browse the repository at this point in the history
* fix replacement issue on Windows (#4480)

* add changelog entry
  • Loading branch information
Guite authored Sep 19, 2020
1 parent eb843dd commit 8399112
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG-3.0.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
- _there should be none_

- Fixes:
- _none yet_
- Fix resolving assets location on Windows if Zikula is installed in a sub directory (#4480).

- Features:
- _there should be none_
Expand Down
2 changes: 1 addition & 1 deletion src/system/ThemeModule/Engine/Asset.php
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function __construct(
*/
public function resolve(string $path): string
{
$publicDir = $this->kernel->getProjectDir() . '/public';
$publicDir = str_replace('\\', '/', $this->kernel->getProjectDir()) . '/public';
$basePath = $this->router->getContext()->getBaseUrl();
$httpRootDir = str_replace($basePath, '', $publicDir);

Expand Down

0 comments on commit 8399112

Please sign in to comment.