extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-26 04:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: Fix can not display content of resolved winmail attachments in compose dialog

Browse Source
This commit is contained in:
Hadi Nategh 2017-01-12 12:37:20 +01:00
parent 2df0dfaa1c
commit da8bb01e33
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1693,7 +1693,8 @@ class mail_compose
$_folder, $_folder,
$attachment['name'], $attachment['name'],
$attachment['mimeType'], $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 ( $this->sessionData['attachments'][]=array (
'uid' => $_uid, 'uid' => $_uid,
@ -1840,6 +1841,7 @@ class mail_compose
'type' => $_type, 'type' => $_type,
'size' => $_size, 'size' => $_size,
'folder' => $_folder, 'folder' => $_folder,
'winmailFlag' => $_is_winmail,
'tmp_name' => mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID)?$_partID:count($this->sessionData['attachments'])+1), 'tmp_name' => mail_ui::generateRowID($this->mail_bo->profileID, $_folder, $_uid).'_'.(!empty($_partID)?$_partID:count($this->sessionData['attachments'])+1),
); );
} }