diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-07-02 15:50:19 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-07-02 15:51:22 +0200 |
| commit | c78a652746fde91ec6c713cdbaf368437d63e2e3 (patch) | |
| tree | 1f42534f56687934213b00eeabd6aa0978a5fb46 | |
| parent | 6913c0ae86cf7e4f1cee74932089b5f250744c09 (diff) | |
Don't clear References and in-Reply-To when a message is "edited as new" (#1489216)
Conflicts:
CHANGELOG
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Don't clear References and in-Reply-To when a message is "edited as new" (#1489216) - Fix messages list sorting with THREAD=REFS - Remove deprecated (in PHP 5.5) PREG /e modifier usage (#1489174) - Fix empty messages list when register_globals is enabled (#1489157) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 9e1b727ae..85fa71231 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -210,8 +210,8 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) $COMPOSE['param']['sent_mbox'] = $sent_folder; } } - else if ($compose_mode == RCUBE_COMPOSE_DRAFT) { - if ($draft_info = $MESSAGE->headers->get('x-draft-info')) { + else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) { + if ($compose_mode == RCUBE_COMPOSE_DRAFT && ($draft_info = $MESSAGE->headers->get('x-draft-info'))) { // get reply_uid/forward_uid to flag the original message when sending $info = rcmail_draftinfo_decode($draft_info); @@ -233,7 +233,7 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) if ($in_reply_to = $MESSAGE->headers->get('in-reply-to')) $COMPOSE['reply_msgid'] = '<' . $in_reply_to . '>'; - $COMPOSE['references'] = $MESSAGE->headers->references; + $COMPOSE['references'] = $MESSAGE->headers->references; } } else { |