diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-16 19:26:03 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-16 19:26:03 +0200 |
commit | 81c9df1363116b0f70161ccf55af4d6aab8c7f6b (patch) | |
tree | 92f5b8c6d4efab2533033ebf4422b20c25f33dd6 /application/render/PageBuilder.php | |
parent | cd2878edeeb1f28356c486c73a12af827b2d9f93 (diff) | |
parent | 7836ed9b2e98e2c6898f011e431d3a58ebcfa3e5 (diff) | |
download | Shaarli-81c9df1363116b0f70161ccf55af4d6aab8c7f6b.tar.gz Shaarli-81c9df1363116b0f70161ccf55af4d6aab8c7f6b.tar.zst Shaarli-81c9df1363116b0f70161ccf55af4d6aab8c7f6b.zip |
Merge pull request #1593 from ArthurHoaro/fix/no-url-rewriting
Diffstat (limited to 'application/render/PageBuilder.php')
-rw-r--r-- | application/render/PageBuilder.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/application/render/PageBuilder.php b/application/render/PageBuilder.php index 41b357dd..2d6d2dbe 100644 --- a/application/render/PageBuilder.php +++ b/application/render/PageBuilder.php | |||
@@ -174,10 +174,12 @@ class PageBuilder | |||
174 | } | 174 | } |
175 | } | 175 | } |
176 | 176 | ||
177 | $rootPath = preg_replace('#/index\.php$#', '', $basePath); | ||
177 | $this->assign('base_path', $basePath); | 178 | $this->assign('base_path', $basePath); |
179 | $this->assign('root_path', $rootPath); | ||
178 | $this->assign( | 180 | $this->assign( |
179 | 'asset_path', | 181 | 'asset_path', |
180 | $basePath . '/' . | 182 | $rootPath . '/' . |
181 | rtrim($this->conf->get('resource.raintpl_tpl', 'tpl'), '/') . '/' . | 183 | rtrim($this->conf->get('resource.raintpl_tpl', 'tpl'), '/') . '/' . |
182 | $this->conf->get('resource.theme', 'default') | 184 | $this->conf->get('resource.theme', 'default') |
183 | ); | 185 | ); |