makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #6422 from marc1706/ticket/17050

Browse source 
[ticket/17050] Remove trailing slash from generated css includes
This commit is contained in:
Marc Alexander 2022-10-22 11:34:54 +02:00
commit 67c41633a2
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/phpbb/template/assets_bag.php
View file

@ -62,27 +62,27 @@ class assets_bag
}
/**
* Returns the HTML code to includes all css assets
* Returns the HTML code to include all css assets
*
* @return string
*/
public function get_stylesheets_content()
public function get_stylesheets_content(): string
{
$output = '';
foreach ($this->stylesheets as $stylesheet)
{
$output .= "<link href=\"{$stylesheet->get_url()}\" rel=\"stylesheet\" media=\"screen\" />\n";
$output .= "<link href=\"{$stylesheet->get_url()}\" rel=\"stylesheet\" media=\"screen\">\n";
}
return $output;
}
/**
* Returns the HTML code to includes all js assets
* Returns the HTML code to include all js assets
*
* @return string
*/
public function get_scripts_content()
public function get_scripts_content(): string
{
$output = '';
foreach ($this->scripts as $script)

8
tests/template/template_includecss_test.php
View file

@ -95,19 +95,19 @@ class phpbb_template_template_includecss_test extends phpbb_template_template_te
*/
array(
array('TEST' => 1),
'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" media="screen" />',
'<link href="tests/template/templates/child_only.css?assets_version=1" rel="stylesheet" media="screen">',
),
array(
array('TEST' => 2),
'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" media="screen" />',
'<link href="tests/template/parent_templates/parent_only.css?assets_version=1" rel="stylesheet" media="screen">',
),
array(
array('TEST' => 3),
'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" media="screen" />',
'<link href="tests/template/ext/include/css/styles/all/theme/test.css?assets_version=1" rel="stylesheet" media="screen">',
),
array(
array('TEST' => 4),
'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" media="screen" />',
'<link href="tests/template/ext/include/css/styles/all/theme/child_only.css?assets_version=1" rel="stylesheet" media="screen">',
),
);
}