From 5f04ec0ad695046528aa2bd55db2ae0e36192fec Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Tue, 26 Feb 2019 11:58:20 +0100 Subject: [PATCH] * Mail: fix opening a forwarded mail as attachment into an existing compose dialog fails --- mail/inc/class.mail_compose.inc.php | 1 + mail/js/app.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index bcdd0bad9a..3c25912a4e 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -324,6 +324,7 @@ class mail_compose if ($appendix_data['emails']) { try { + if ($appendix_data['emails']['processedmail_id']) $_content['processedmail_id'] .= ','.$appendix_data['emails']['processedmail_id']; $attched_uids = $this->_get_uids_as_attachments($appendix_data['emails']['ids'], $_content['serverID']); if (is_array($attched_uids)) { diff --git a/mail/js/app.js b/mail/js/app.js index 13f1e4e9b2..ffd66d25bc 100644 --- a/mail/js/app.js +++ b/mail/js/app.js @@ -633,7 +633,7 @@ app.classes.mail = AppJS.extend( for(var j = 1; j < _elems.length; j++) settings.id = settings.id + ',' + _elems[j].id; } - return egw.openWithinWindow("mail", "setCompose", {data:{emails:{ids:settings.id}}}, settings, /mail.mail_compose.compose/); + return egw.openWithinWindow("mail", "setCompose", {data:{emails:{ids:settings.id, processedmail_id:settings.id}}}, settings, /mail.mail_compose.compose/); } else {