extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-18 11:58:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Mail: fix losing inline images after being re-saved as draft or created as new

Browse Source
This commit is contained in:
Hadi Nategh 2021-04-13 13:23:09 +02:00
parent fe79fe390f
commit 4af0bec278
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/Mail.php
View File

@ -6818,7 +6818,7 @@ class Mail
if ($URI_params['mailbox'] && $URI_params['uid'] && $URI_params['cid']) if ($URI_params['mailbox'] && $URI_params['uid'] && $URI_params['cid'])
{ {
$mail_bo->reopen(base64_decode($URI_params['mailbox'])); $mail_bo->reopen(base64_decode($URI_params['mailbox']));
$attachment = $mail_bo->getAttachmentByCID($URI_params['uid'], base64_decode($URI_params['cid']),base64_decode($URI_params['partID']),true); $attachment = $mail_bo->getAttachmentByCID(base64_decode($URI_params['uid']), base64_decode($URI_params['cid']),base64_decode($URI_params['partID']),true);
$mail_bo->closeConnection(); $mail_bo->closeConnection();
if ($attachment) if ($attachment)
{ {

4
mail/inc/class.mail_ui.inc.php
View File

@ -2678,7 +2678,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
*/ */
function displayImage() function displayImage()
{ {
$uid = $_GET['uid']; $uid = base64_decode($_GET['uid']);
$cid = base64_decode($_GET['cid']); $cid = base64_decode($_GET['cid']);
$partID = urldecode($_GET['partID']); $partID = urldecode($_GET['partID']);
if (!empty($_GET['mailbox'])) $mailbox = base64_decode($_GET['mailbox']); if (!empty($_GET['mailbox'])) $mailbox = base64_decode($_GET['mailbox']);
@ -3602,7 +3602,7 @@ $filter['before']= date("d-M-Y", $cutoffdate2);
{ {
$linkData = array ( $linkData = array (
'menuaction' => 'mail.mail_ui.displayImage', 'menuaction' => 'mail.mail_ui.displayImage',
'uid' => $_uid, 'uid' => base64_encode($_uid),
'mailbox' => base64_encode($_mailbox), 'mailbox' => base64_encode($_mailbox),
'cid' => base64_encode($_cid), 'cid' => base64_encode($_cid),
'partID' => $_partID, 'partID' => $_partID,