holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests 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 e9a6ffd87e
commit 31629aeea5
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

@ -1690,7 +1690,8 @@ class mail_compose
$_folder,
$attachment['name'],
$attachment['mimeType'],
$attachment['size']);
$attachment['size'],
$attachment['is_winmail']);
}
}
}
@ -1828,7 +1829,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,
@ -1837,6 +1838,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),
);
}