From f7ffdc90aab8d37c2f2c1c89a8e8f68cb793ac00 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Thu, 1 Aug 2013 14:52:59 +0200 Subject: Fix fatal error when opening non-existing message in compose window --- program/steps/mail/compose.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 590d9c27f..9bf36d225 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -207,7 +207,10 @@ if (!empty($msg_uid) && empty($COMPOSE['as_attachment'])) if (!empty($MESSAGE->headers->charset)) $RCMAIL->storage->set_charset($MESSAGE->headers->charset); - if ($compose_mode == RCUBE_COMPOSE_REPLY) { + if (!$MESSAGE->headers) { + // error + } + else if ($compose_mode == RCUBE_COMPOSE_REPLY) { $COMPOSE['reply_uid'] = $msg_uid; $COMPOSE['reply_msgid'] = $MESSAGE->headers->messageID; $COMPOSE['references'] = trim($MESSAGE->headers->references . " " . $MESSAGE->headers->messageID); -- cgit v1.2.3