mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00
Code Issues Releases Wiki Activity

[ticket/14457] Don't set CSS to JS and JS to CSS

Browse Source 
PHPBB3-14457
This commit is contained in:
Tristan Darricau 2016-02-07 12:49:00 +01:00
parent f7c5098c60
commit 99ace63e62
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/template/twig/environment.php
View File

@ -230,8 +230,8 @@ class environment extends \Twig_Environment
*/
private function inject_assets($output, $placeholder_salt)
{
$output = str_replace('__SCRIPTS_' . $placeholder_salt . '__', $this->assets_bag->get_stylesheets_content(), $output);
$output = str_replace('__STYLESHEETS_' . $placeholder_salt . '__', $this->assets_bag->get_scripts_content(), $output);
$output = str_replace('__STYLESHEETS_' . $placeholder_salt . '__', $this->assets_bag->get_stylesheets_content(), $output);
$output = str_replace('__SCRIPTS_' . $placeholder_salt . '__', $this->assets_bag->get_scripts_content(), $output);
return $output;
}

1
tests/template/template_test_case.php
View File

@ -172,6 +172,7 @@ class phpbb_template_template_test_case extends phpbb_test_case
$expected = str_replace(array("\n", "\r", "\t"), '', $expected);
$output = str_replace(array("\n", "\r", "\t"), '', $this->display('test'));
$this->assertEquals($expected, $output, "Testing $file");
}
}