diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-08-23 16:30:26 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-08-23 16:30:26 +0200 |
| commit | a7272fec9767ff6ce0b9f560c57afb0965d17c25 (patch) | |
| tree | 1c1225ccddd4f297baafc22c8481391c8dd83f54 /phpBB/phpbb/template | |
| parent | f585f48aca3053862e81d0ff63956940c53878e7 (diff) | |
| parent | 5f905f67ee79093a217f6ffbe1143386851b843d (diff) | |
| download | forums-a7272fec9767ff6ce0b9f560c57afb0965d17c25.tar forums-a7272fec9767ff6ce0b9f560c57afb0965d17c25.tar.gz forums-a7272fec9767ff6ce0b9f560c57afb0965d17c25.tar.bz2 forums-a7272fec9767ff6ce0b9f560c57afb0965d17c25.tar.xz forums-a7272fec9767ff6ce0b9f560c57afb0965d17c25.zip | |
Merge pull request #3829 from Nicofuma/ticket/14099
[ticket/14099] Update Twig to 1.20.0
Diffstat (limited to 'phpBB/phpbb/template')
| -rw-r--r-- | phpBB/phpbb/template/asset.php | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/phpbb/template/asset.php b/phpBB/phpbb/template/asset.php index 67dbd7b357..ff9366af4a 100644 --- a/phpBB/phpbb/template/asset.php +++ b/phpBB/phpbb/template/asset.php @@ -152,6 +152,24 @@ 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($this->path_helper->get_phpbb_root_path()) . DIRECTORY_SEPARATOR; + + // If the asset is under the phpBB root path we need to remove its path and then prepend $phpbb_root_path + if (substr($path . DIRECTORY_SEPARATOR, 0, strlen($real_root_path)) === $real_root_path) + { + $path = $this->path_helper->get_phpbb_root_path() . str_replace('\\', '/', substr($path, strlen($real_root_path))); + } + else + { + // Else we make the path relative to the current 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 +179,7 @@ class asset } $path = implode('/', $paths); } + $this->components['path'] = $path; } |