diff options
| author | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-21 09:34:26 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2015-08-21 09:34:26 +0200 |
| commit | b802732167959e409fd87f9c4c4da5b4a427c865 (patch) | |
| tree | 9625be4652b536700872101e7e0967eb3380335c /phpBB/phpbb | |
| parent | 6c98b01ad1216f89695dbf2cc59d985e53544751 (diff) | |
| parent | 5f905f67ee79093a217f6ffbe1143386851b843d (diff) | |
| download | forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar.gz forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar.bz2 forums-b802732167959e409fd87f9c4c4da5b4a427c865.tar.xz forums-b802732167959e409fd87f9c4c4da5b4a427c865.zip | |
Merge branch 'ticket/14099' into 3.1.x
* ticket/14099:
[ticket/14099] Fix the assets
[ticket/14099] Make composer.phar executable again
[ticket/14099] Fix tests
[ticket/14099] Update twig/twig to 1.20.0
[ticket/14099] Update composer.phar
Diffstat (limited to 'phpBB/phpbb')
| -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; } |