From 9796cd2063770a8562d58d6492fd6904cdeb4627 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak <alec@alec.pl> Date: Mon, 02 May 2016 12:01:18 -0400 Subject: [PATCH] Merge branch 'dev-rfc822-preview' --- program/steps/mail/compose.inc | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 83019cf..bc491c3 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -5,7 +5,7 @@ | program/steps/mail/compose.inc | | | | This file is part of the Roundcube Webmail client | - | Copyright (C) 2005-2013, The Roundcube Dev Team | + | Copyright (C) 2005-2016, The Roundcube Dev Team | | | | Licensed under the GNU General Public License version 3 or | | any later version with exceptions for skins & plugins. | @@ -179,7 +179,7 @@ $MESSAGE = new rcube_message($msg_uid); // make sure message is marked as read - if ($MESSAGE->headers && empty($MESSAGE->headers->flags['SEEN'])) { + if ($MESSAGE->headers && $MESSAGE->context === null && empty($MESSAGE->headers->flags['SEEN'])) { $RCMAIL->storage->set_flag($msg_uid, 'SEEN'); } @@ -192,7 +192,7 @@ } else if ($compose_mode == RCUBE_COMPOSE_FORWARD || $compose_mode == RCUBE_COMPOSE_REPLY) { if ($compose_mode == RCUBE_COMPOSE_REPLY) { - $COMPOSE['reply_uid'] = $msg_uid; + $COMPOSE['reply_uid'] = $MESSAGE->context === null ? $msg_uid : null; if (!empty($COMPOSE['param']['all'])) { $MESSAGE->reply_all = $COMPOSE['param']['all']; @@ -780,7 +780,7 @@ if (!empty($MESSAGE->parts)) { // collect IDs of message/rfc822 parts - foreach ($MESSAGE->mime_parts as $part) { + foreach ($MESSAGE->mime_parts() as $part) { if ($part->mimetype == 'message/rfc822') { $messages[] = $part->mime_id; } @@ -1255,7 +1255,7 @@ return $cid_map; } - foreach ((array)$message->mime_parts as $pid => $part) { + foreach ((array) $message->mime_parts() as $pid => $part) { if ($part->mimetype == 'message/rfc822') { $messages[] = $part->mime_id; } @@ -1321,7 +1321,7 @@ return $cid_map; } - foreach ((array)$message->mime_parts as $pid => $part) { + foreach ((array) $message->mime_parts() as $pid => $part) { if ($part->mimetype == 'message/rfc822') { $messages[] = $part->mime_id; } -- Gitblit v1.9.1