summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-05-06 17:45:53 +0000
committeralec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>2009-05-06 17:45:53 +0000
commit60a37e4b6b3f144c54ec9638bf2a41e329692dd8 (patch)
tree808329e61bb1ff8ddd8f891fd692c46799200d0c
parentefe6d8ceda35a46f4b71e1523a79efd535543102 (diff)
- Fix html editor mode setting when reopening draft message (#1485834)
git-svn-id: https://svn.roundcube.net/trunk@2458 208e9e7b-5314-0410-a742-e7e81cd9613c
-rw-r--r--roundcubemail/CHANGELOG1
-rw-r--r--roundcubemail/program/steps/mail/compose.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index 84c0726ae..fd969be40 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix html editor mode setting when reopening draft message (#1485834)
- Added quick search box menu (#1484304)
- Fix wrong column sort order icons (#1485823)
- Updated TinyMCE to 3.2.3 version
diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index d122a9232..b31d73775 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -363,7 +363,7 @@ function rcmail_compose_body($attrib)
}
else if ($compose_mode)
{
- if ($isHtml && $MESSAGE->has_html_part())
+ if (($isHtml || $compose_mode == RCUBE_COMPOSE_DRAFT) && $MESSAGE->has_html_part())
{
$body = $MESSAGE->first_html_part();
$isHtml = true;