mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/14099] Fix tests

Browse Source 
PHPBB3-14099
This commit is contained in:
Tristan Darricau
2015-08-13 10:53:34 +02:00
parent a24f9a7ad7
commit a83bcaa8ac
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/template/asset.php
View File

@@ -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;
}