diff options
| author | Nicofuma <github@nicofuma.fr> | 2015-02-03 12:41:31 +0100 |
|---|---|---|
| committer | Nicofuma <github@nicofuma.fr> | 2015-02-03 13:37:52 +0100 |
| commit | f4b42c961f5729b0bbadca8a897410f890228364 (patch) | |
| tree | 03dd67a9342ec4cc21acb7eecf25f4a718111f96 /phpBB/phpbb/template/asset.php | |
| parent | 199e7cf5a1b5aa08ce41fbf848e443f10828c4dd (diff) | |
| download | forums-f4b42c961f5729b0bbadca8a897410f890228364.tar forums-f4b42c961f5729b0bbadca8a897410f890228364.tar.gz forums-f4b42c961f5729b0bbadca8a897410f890228364.tar.bz2 forums-f4b42c961f5729b0bbadca8a897410f890228364.tar.xz forums-f4b42c961f5729b0bbadca8a897410f890228364.zip | |
[ticket/13139] Fix tests
PHPBB3-13139
Diffstat (limited to 'phpBB/phpbb/template/asset.php')
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 67dbd7b357..4729685459 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -152,6 +152,12 @@ 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; + 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))); + } + if ($urlencode) { $paths = explode('/', $path); @@ -161,6 +167,7 @@ class asset } $path = implode('/', $paths); } + $this->components['path'] = $path; } |