mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-09 10:16:36 +02:00
Code Issues Releases Wiki Activity

[ticket/13139] Fix tests

Browse Source 
PHPBB3-13139
This commit is contained in:
Nicofuma
2015-02-03 12:41:31 +01:00
parent 199e7cf5a1
commit f4b42c961f
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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