summaryrefslogtreecommitdiff
path: root/program/steps/mail/compose.inc
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-08-27 10:16:04 +0200
committerAleksander Machniak <alec@alec.pl>2012-08-27 10:16:04 +0200
commit8eefbb2158c43b51a8c33e6c480cbe61539b9535 (patch)
tree11c5a963e437823fb2688a53a3d5121513ff2d8a /program/steps/mail/compose.inc
parent5f8adabb6286fdcb0ff8a0ea5d1d58f40eef51f4 (diff)
Add option to enable HTML editor on forwarding (#1488517)
Diffstat (limited to 'program/steps/mail/compose.inc')
-rw-r--r--program/steps/mail/compose.inc7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index c243c887e..e57b44ae6 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -610,9 +610,12 @@ function rcmail_compose_editor_mode()
$useHtml = $MESSAGE->has_html_part(false);
}
else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
- $useHtml = ($html_editor == 1 || ($html_editor == 2 && $MESSAGE->has_html_part(false)));
+ $useHtml = ($html_editor == 1 || ($html_editor >= 2 && $MESSAGE->has_html_part(false)));
}
- else { // RCUBE_COMPOSE_FORWARD or NEW
+ else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
+ $useHtml = ($html_editor == 1 || ($html_editor == 3 && $MESSAGE->has_html_part(false)));
+ }
+ else {
$useHtml = ($html_editor == 1);
}