makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
Show stats 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) 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) if ($urlencode)
{ {
$paths = explode('/', $path); $paths = explode('/', $path);
@ -161,6 +167,7 @@ class asset
} }
$path = implode('/', $paths); $path = implode('/', $paths);
} }
$this->components['path'] = $path; $this->components['path'] = $path;
} }

11
tests/template/template_includecss_test.php
View file

@ -83,13 +83,6 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
public function template_data() public function template_data()
{ {
$url_base = explode('/', dirname(__FILE__));
foreach ($url_base as &$dir)
{
$dir = rawurlencode($dir);
}
$url_base = implode('/', $url_base);
return array( return array(
/* /*
array( array(
@ -107,11 +100,11 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
), ),
array( array(
array('TEST' => 3), array('TEST' => 3),
'<link href="' . $url_base . '/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', '<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
), ),
array( array(
array('TEST' => 4), array('TEST' => 4),
'<link href="' . $url_base . '/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />', '<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" type="text/css" media="screen, projection" />',
), ),
); );
} }