aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/template/asset.php
diff options
context:
space:
mode:
authorNicofuma <github@nicofuma.fr>2015-02-22 16:56:57 +0100
committerNicofuma <github@nicofuma.fr>2015-05-04 23:23:18 +0200
commit3b631cb40d1641dce8789fabd79e3cbc5598747d (patch)
treea211b7e7815b4a5daa0bc51535cb8752ae6428ea /phpBB/phpbb/template/asset.php
parentba53901ffb734995b42626a71a81a5abaa55f85d (diff)
downloadforums-3b631cb40d1641dce8789fabd79e3cbc5598747d.tar
forums-3b631cb40d1641dce8789fabd79e3cbc5598747d.tar.gz
forums-3b631cb40d1641dce8789fabd79e3cbc5598747d.tar.bz2
forums-3b631cb40d1641dce8789fabd79e3cbc5598747d.tar.xz
forums-3b631cb40d1641dce8789fabd79e3cbc5598747d.zip
[ticket/13638] Prepend the assets path phpbb root
PHPBB3-13638
Diffstat (limited to 'phpBB/phpbb/template/asset.php')
-rw-r--r--phpBB/phpbb/template/asset.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php
index 4729685459..d9ed861034 100644
--- a/phpBB/phpbb/template/asset.php
+++ b/phpBB/phpbb/template/asset.php
@@ -153,9 +153,9 @@ class asset
public function set_path($path, $urlencode = false)
{
// Since 1.7.0 Twig returns the real path of the file. We need it to be relative to the working directory.
- $real_root_path = realpath('.') . DIRECTORY_SEPARATOR;
+ $real_root_path = realpath($this->path_helper->get_phpbb_root_path()) . DIRECTORY_SEPARATOR;
if ($real_root_path && substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) {
- $path = str_replace('\\', '/', substr($path, strlen($real_root_path)));
+ $path = $this->path_helper->get_phpbb_root_path() . str_replace('\\', '/', substr($path, strlen($real_root_path)));
}
if ($urlencode)