Merge branch 'QA_4_6'

This commit is contained in:
Michal Čihař 2016-06-17 11:44:30 +02:00
commit 41d5c1e127

View File

@ -221,13 +221,11 @@ class Sanitize
*/
public static function jsFormat($a_string = '', $add_backquotes = true)
{
if (is_string($a_string)) {
$a_string = htmlspecialchars($a_string);
$a_string = Sanitize::escapeJsString($a_string);
// Needed for inline javascript to prevent some browsers
// treating it as a anchor
$a_string = str_replace('#', '\\#', $a_string);
}
$a_string = htmlspecialchars($a_string);
$a_string = Sanitize::escapeJsString($a_string);
// Needed for inline javascript to prevent some browsers
// treating it as a anchor
$a_string = str_replace('#', '\\#', $a_string);
return $add_backquotes
? Util::backquote($a_string)