Skip to content
Snippets Groups Projects
Commit fc021986 authored by Uma's avatar Uma
Browse files

Merge branch 'xss_vulnerability_on_ckeditor' into 'master'

Fixes #1220 Reverted general code logic for XSS attack

See merge request !511
parents 312e5d0b 7485a71b
No related branches found
No related tags found
No related merge requests found
......@@ -675,9 +675,9 @@ function decode_html($str) {
global $default_charset;
// Direct Popup action or Ajax Popup action should be treated the same.
if ((isset($_REQUEST['action']) && $_REQUEST['action'] == 'Popup') || (isset($_REQUEST['file']) && $_REQUEST['file'] == 'Popup'))
return purifyHtmlEventAttributes(html_entity_decode($str));
return html_entity_decode($str);
else
return purifyHtmlEventAttributes(html_entity_decode($str, ENT_QUOTES, $default_charset));
return html_entity_decode($str, ENT_QUOTES, $default_charset);
}
function popup_decode_html($str) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment