extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: fix opening a forwarded mail as attachment into an existing compose dialog fails

Browse Source
This commit is contained in:
Hadi Nategh 2019-02-26 11:58:20 +01:00
parent 9253e5230a
commit 5f04ec0ad6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
mail/inc/class.mail_compose.inc.php
View File

@ -324,6 +324,7 @@ class mail_compose
if ($appendix_data['emails']) if ($appendix_data['emails'])
{ {
try { 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']); $attched_uids = $this->_get_uids_as_attachments($appendix_data['emails']['ids'], $_content['serverID']);
if (is_array($attched_uids)) if (is_array($attched_uids))
{ {

2
mail/js/app.js
View File

@ -633,7 +633,7 @@ app.classes.mail = AppJS.extend(
for(var j = 1; j < _elems.length; j++) for(var j = 1; j < _elems.length; j++)
settings.id = settings.id + ',' + _elems[j].id; 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 else
{ {