diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-13 10:53:34 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-14 15:52:35 +0200 |
| commit | a83bcaa8ac5e574d7616950cb8cd29221f6b75cc (patch) | |
| tree | 4a4e7a139cd832307883e20ea96315669d26f9eb /phpBB/phpbb/template | |
| parent | a24f9a7ad7cbb04f0770975cd6bc5d0b2dcf1f59 (diff) | |
| download | forums-a83bcaa8ac5e574d7616950cb8cd29221f6b75cc.tar forums-a83bcaa8ac5e574d7616950cb8cd29221f6b75cc.tar.gz forums-a83bcaa8ac5e574d7616950cb8cd29221f6b75cc.tar.bz2 forums-a83bcaa8ac5e574d7616950cb8cd29221f6b75cc.tar.xz forums-a83bcaa8ac5e574d7616950cb8cd29221f6b75cc.zip | |
[ticket/14099] Fix tests
PHPBB3-14099
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 67dbd7b357..e2edbcddc1 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -152,6 +152,13 @@ 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 +168,7 @@ class asset } $path = implode('/', $paths); } + $this->components['path'] = $path; } |