summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2013-04-19 08:05:33 +0200
committerAleksander Machniak <alec@alec.pl>2013-04-19 08:06:36 +0200
commit8b8462018a57276033d5c6a81959f40a34d0a010 (patch)
tree28daf2a6fe57534834270e8b8c4e8ef35e0b7a8f
parent9824e212cc3a8ca7ba8c69f75f6adfe8ea318191 (diff)
Fix handling of deprecated boolean value of reply_mode option (#1489052)
Conflicts: CHANGELOG
-rw-r--r--CHANGELOG2
-rw-r--r--program/steps/mail/compose.inc2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fe342a411..485b720bf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix handling of deprecated boolean value of reply_mode option (#1489052)
+
RELEASE 0.9.0
-------------
- Fix display of HTML entities in protected folder name (#1489042)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index a35dab27f..415ddeb74 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -562,7 +562,7 @@ function rcmail_prepare_message_body()
rcmail_write_forward_attachments();
}
// reply/edit/draft/forward
- else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || $RCMAIL->config->get('reply_mode') != -1)) {
+ else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || intval($RCMAIL->config->get('reply_mode')) != -1)) {
$isHtml = rcmail_compose_editor_mode();
if (!empty($MESSAGE->parts)) {