diff options
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 1 | ||||
| -rw-r--r-- | program/steps/settings/edit_identity.inc | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 47d97faad..374a87649 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -772,6 +772,7 @@ function rcmail_compose_body($attrib) if ($isHtml) { $MESSAGE_BODY = htmlentities($MESSAGE_BODY, ENT_NOQUOTES, RCMAIL_CHARSET); $attrib['class'] = 'mce_editor'; + $attrib['is_escaped'] = true; $textarea = new html_textarea($attrib); $out .= $textarea->show($MESSAGE_BODY); } diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index c3ac4688f..2a2616540 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -88,7 +88,8 @@ function rcube_identity_form($attrib) // Enable TinyMCE editor if ($IDENTITY_RECORD['html_signature']) { - $form['signature']['content']['signature']['class'] = 'mce_editor'; + $form['signature']['content']['signature']['class'] = 'mce_editor'; + $form['signature']['content']['signature']['is_escaped'] = true; } $IDENTITY_RECORD['signature'] = htmlentities($IDENTITY_RECORD['signature'], ENT_NOQUOTES, RCMAIL_CHARSET); |