diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 15:08:36 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2015-02-03 15:08:36 +0100 |
| commit | ceaba8aaf94583b437f08f6d004d031b9a9ad345 (patch) | |
| tree | 03dd67a9342ec4cc21acb7eecf25f4a718111f96 /phpBB/phpbb | |
| parent | 7e91320995fcc9f4abe299a05edcc3b3535ecf14 (diff) | |
| parent | f4b42c961f5729b0bbadca8a897410f890228364 (diff) | |
| download | forums-ceaba8aaf94583b437f08f6d004d031b9a9ad345.tar forums-ceaba8aaf94583b437f08f6d004d031b9a9ad345.tar.gz forums-ceaba8aaf94583b437f08f6d004d031b9a9ad345.tar.bz2 forums-ceaba8aaf94583b437f08f6d004d031b9a9ad345.tar.xz forums-ceaba8aaf94583b437f08f6d004d031b9a9ad345.zip | |
Merge pull request #3028 from Nicofuma/ticket/13139
[ticket/13139] Update Twig to 1.18.0
* Nicofuma/ticket/13139:
[ticket/13139] Fix tests
[ticket/13139] Update Twig to 1.8.0
[ticket/13139] Update Twig to 1.16.2
Diffstat (limited to 'phpBB/phpbb')
| -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; } |