diff options
| author | alecpl <alec@alec.pl> | 2009-09-03 06:49:00 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2009-09-03 06:49:00 +0000 |
| commit | 80815d23e596528642a9321eb694715530d6f1d6 (patch) | |
| tree | 120f4fa2fcf4b5b0bf2df64922483094f9bcf1a5 /program/steps | |
| parent | 64901dd0cc0c06458477653387bc8be8727abb7e (diff) | |
- Fix editor type doesn't match type of message body content (#1486080)
Diffstat (limited to 'program/steps')
| -rw-r--r-- | program/steps/mail/compose.inc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 2565d46f1..79a95dbcf 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -393,7 +393,7 @@ function rcmail_compose_body($attrib) $attrib['name'] = '_message'; - if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->first_html_part())) + if ($CONFIG['htmleditor'] || (($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) && $MESSAGE->has_html_part())) $isHtml = true; else $isHtml = false; @@ -422,7 +422,7 @@ function rcmail_compose_body($attrib) $body = $MESSAGE->first_text_part(); $isHtml = false; } - + // compose reply-body if ($compose_mode == RCUBE_COMPOSE_REPLY) $body = rcmail_create_reply_body($body, $isHtml); @@ -911,10 +911,11 @@ function rcmail_editor_selector($attrib) global $CONFIG, $MESSAGE, $compose_mode; // determine whether HTML or plain text should be checked - $useHtml = $CONFIG['htmleditor'] ? true : false; - if ($compose_mode) - $useHtml = ($useHtml && $MESSAGE->has_html_part()); + $useHtml = (($CONFIG['htmleditor'] || $compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) + && $MESSAGE->has_html_part()); + else + $useHtml = $CONFIG['htmleditor'] ? true : false; if (empty($attrib['editorid'])) $attrib['editorid'] = 'rcmComposeBody'; |