mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
* Mail: Fix can not display content of resolved winmail attachments in compose dialog
This commit is contained in:
parent
2df0dfaa1c
commit
da8bb01e33
@ -1693,7 +1693,8 @@ class mail_compose
|
||||
$_folder,
|
||||
$attachment['name'],
|
||||
$attachment['mimeType'],
|
||||
$attachment['size']);
|
||||
$attachment['size'],
|
||||
$attachment['is_winmail']);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1831,7 +1832,7 @@ class mail_compose
|
||||
}
|
||||
}
|
||||
|
||||
function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size)
|
||||
function addMessageAttachment($_uid, $_partID, $_folder, $_name, $_type, $_size, $_is_winmail= null)
|
||||
{
|
||||
$this->sessionData['attachments'][]=array (
|
||||
'uid' => $_uid,
|
||||
@ -1840,6 +1841,7 @@ class mail_compose
|
||||
'type' => $_type,
|
||||
'size' => $_size,
|
||||
'folder' => $_folder,
|
||||
'winmailFlag' => $_is_winmail,
|
||||
'tmp_name' => mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID)?$_partID:count($this->sessionData['attachments'])+1),
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user