mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-11 18:15:20 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source
This commit is contained in:
Marc Alexander 2018-01-17 23:06:19 +01:00
commit 82ccc43767
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/template/assets_bag.php
View File

@ -71,7 +71,7 @@ class assets_bag
$output = ''; $output = '';
foreach ($this->stylesheets as $stylesheet) foreach ($this->stylesheets as $stylesheet)
{ {
$output .= "<link href=\"{$stylesheet->get_url()}\" rel=\"stylesheet\" type=\"text/css\" media=\"screen\" />\n"; $output .= "<link href=\"{$stylesheet->get_url()}\" rel=\"stylesheet\" media=\"screen\" />\n";
} }
return $output; return $output;
@ -87,7 +87,7 @@ class assets_bag
$output = ''; $output = '';
foreach ($this->scripts as $script) foreach ($this->scripts as $script)
{ {
$output .= "<script type=\"text/javascript\" src=\"{$script->get_url()}\"></script>\n"; $output .= "<script src=\"{$script->get_url()}\"></script>\n";
} }
return $output; return $output;

8
tests/template/template_includecss_test.php
View File

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

32
tests/template/template_includejs_test.php
View File

@ -28,67 +28,67 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
*/ */
array( array(
array('TEST' => 1), array('TEST' => 1),
'<script type="text/javascript" src="tests/template/templates/parent_and_child.js?assets_version=1"></script>', '<script src="tests/template/templates/parent_and_child.js?assets_version=1"></script>',
), ),
array( array(
array('TEST' => 2), array('TEST' => 2),
'<script type="text/javascript" src="tests/template/templates/parent_and_child.js?assets_version=0"></script>', '<script src="tests/template/templates/parent_and_child.js?assets_version=0"></script>',
), ),
array( array(
array('TEST' => 3), array('TEST' => 3),
'<script type="text/javascript" src="tests/template/templates/parent_and_child.js?test=1&assets_version=0"></script>', '<script src="tests/template/templates/parent_and_child.js?test=1&assets_version=0"></script>',
), ),
array( array(
array('TEST' => 4), array('TEST' => 4),
'<script type="text/javascript" src="tests/template/templates/parent_and_child.js?test=1&amp;assets_version=0"></script>', '<script src="tests/template/templates/parent_and_child.js?test=1&amp;assets_version=0"></script>',
), ),
array( array(
array('TEST' => 6), array('TEST' => 6),
'<script type="text/javascript" src="tests/template/parent_templates/parent_only.js?assets_version=1"></script>', '<script src="tests/template/parent_templates/parent_only.js?assets_version=1"></script>',
), ),
array( array(
array('TEST' => 7), array('TEST' => 7),
'<script type="text/javascript" src="tests/template/templates/child_only.js?assets_version=1"></script>', '<script src="tests/template/templates/child_only.js?assets_version=1"></script>',
), ),
array( array(
array('TEST' => 8), array('TEST' => 8),
'<script type="text/javascript" src="tests/template/templates/subdir/parent_only.js?assets_version=1"></script>', '<script src="tests/template/templates/subdir/parent_only.js?assets_version=1"></script>',
), ),
array( array(
array('TEST' => 9), array('TEST' => 9),
'<script type="text/javascript" src="tests/template/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>', '<script src="tests/template/templates/subdir/subsubdir/parent_only.js?assets_version=1"></script>',
), ),
array( array(
array('TEST' => 10), array('TEST' => 10),
'<script type="text/javascript" src="tests/template/templates/subdir/parent_only.js?assets_version=1"></script>', '<script src="tests/template/templates/subdir/parent_only.js?assets_version=1"></script>',
), ),
array( array(
array('TEST' => 11), array('TEST' => 11),
'<script type="text/javascript" src="tests/template/templates/child_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>', '<script src="tests/template/templates/child_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
), ),
array( array(
array('TEST' => 12), array('TEST' => 12),
'<script type="text/javascript" src="tests/template/parent_templates/parent_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>', '<script src="tests/template/parent_templates/parent_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
), ),
array( array(
array('TEST' => 14), array('TEST' => 14),
'<script type="text/javascript" src="tests/template/parent_templates/parent_only.js?test1=&quot;&amp;assets_version=1#test3"></script>', '<script src="tests/template/parent_templates/parent_only.js?test1=&quot;&amp;assets_version=1#test3"></script>',
), ),
array( array(
array('TEST' => 15), array('TEST' => 15),
'<script type="text/javascript" src="http://phpbb.com/b.js?c=d#f"></script>', '<script src="http://phpbb.com/b.js?c=d#f"></script>',
), ),
array( array(
array('TEST' => 16), array('TEST' => 16),
'<script type="text/javascript" src="http://phpbb.com/b.js?c=d&assets_version=2#f"></script>', '<script src="http://phpbb.com/b.js?c=d&assets_version=2#f"></script>',
), ),
array( array(
array('TEST' => 17), array('TEST' => 17),
'<script type="text/javascript" src="//phpbb.com/b.js"></script>', '<script src="//phpbb.com/b.js"></script>',
), ),
array( array(
array('TEST' => 18), array('TEST' => 18),
'<script type="text/javascript" src="tests/template/templates/parent_and_child.js?test=1&test2=0&amp;assets_version=1"></script>', '<script src="tests/template/templates/parent_and_child.js?test=1&test2=0&amp;assets_version=1"></script>',
), ),
); );
} }