mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-29 04:50:51 +02:00
Code Issues Releases Wiki Activity

[ticket/11647] Always use & for URLs

Browse Source 
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs

PHPBB3-11647
This commit is contained in:
Vjacheslav Trushkin
2013-07-11 18:13:48 -04:00
parent 94fc0cccdc
commit f5c2119e7c
3 changed files with 9 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/template/template_includejs_test.php
View File

@@ -30,16 +30,12 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
),
array(
array('TEST' => 3),
'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></script>',
'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&assets_version=0"></script>',
),
array(
array('TEST' => 4),
'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&amp;assets_version=0"></script>',
),
array(
array('TEST' => 5),
'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1;assets_version=0"></script>',
),
array(
array('TEST' => 6),
'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?assets_version=1"></script>',
@@ -68,10 +64,6 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
array('TEST' => 12),
'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1&amp;test2=2&amp;assets_version=1#test3"></script>',
),
array(
array('TEST' => 13),
'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=1;test2=2;assets_version=1#test3"></script>',
),
array(
array('TEST' => 14),
'<script type="text/javascript" src="' . $this->test_path . '/parent_templates/parent_only.js?test1=&quot;&amp;assets_version=1#test3"></script>',
@@ -88,6 +80,10 @@ class phpbb_template_template_includejs_test extends phpbb_template_template_tes
array('TEST' => 17),
'<script type="text/javascript" src="//phpbb.com/b.js"></script>',
),
array(
array('TEST' => 18),
'<script type="text/javascript" src="' . $this->test_path . '/templates/parent_and_child.js?test=1&test2=0&amp;assets_version=1"></script>',
),
);
}