diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-03-14 12:17:38 +0100 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-03-14 12:17:38 +0100 |
| commit | 542f15bfece569ba3d07f57339aca22e535027dd (patch) | |
| tree | c77e822171d59227a39aa8c378741b62b9ad2edb | |
| parent | 5c26bd49b10a2666df9e4853b0740038b0cc3b88 (diff) | |
Enriched content should be also converted to text if html is disabled
| -rw-r--r-- | program/steps/mail/compose.inc | 3 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index dd6a1d88c..640272400 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -675,9 +675,6 @@ function rcmail_compose_part_body($part, $isHtml = false) $txt = new rcube_html2text($body, false, true, $len); $body = $txt->get_text(); } - else if ($part->ctype_secondary == 'enriched') { - $body = rcube_enriched::to_html($body); - } else { if ($part->ctype_secondary == 'plain' && $part->ctype_parameters['format'] == 'flowed') { $body = rcube_mime::unfold_flowed($body); diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 137e87d49..3aea6322e 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -707,7 +707,10 @@ function rcmail_print_body($part, $p = array()) + $p + array('safe' => false, 'plain' => false, 'inline_html' => true)); // convert html to text/plain - if ($data['type'] == 'html' && $data['plain']) { + if ($data['plain'] && ($data['type'] == 'html' || $data['type'] == 'enriched')) { + if ($data['type'] == 'enriched') { + $data['body'] = rcube_enriched::to_html($data['body']); + } $txt = new rcube_html2text($data['body'], false, true); $body = $txt->get_text(); $part->ctype_secondary = 'plain'; |