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

Mail - stop additional mail in sent folder when merging multiple contacts into email

Browse Source
This commit is contained in:
nathangray 2017-11-14 17:00:17 -07:00
parent f9e1e1b2a6
commit ddd45ccc2e
1 changed files with 31 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
api/src/Mail.php
View File

@ -6972,7 +6972,9 @@ class Mail
} }
if ($sendOK || $openAsDraft) if ($sendOK || $openAsDraft)
{ {
if ($this->folderExists($_folder,true)) if ($openAsDraft)
{
if($this->folderExists($_folder,true))
{ {
if($this->isSentFolder($_folder)) if($this->isSentFolder($_folder))
{ {
@ -7007,6 +7009,7 @@ class Mail
$savefailed = true; $savefailed = true;
$alert_msg .= lang("Saving of message %1 failed. Destination Folder %2 does not exist.",$Subject,$_folder); $alert_msg .= lang("Saving of message %1 failed. Destination Folder %2 does not exist.",$Subject,$_folder);
} }
}
if ($sendOK) if ($sendOK)
{ {
$processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed?' but failed to store to Folder:'.$_folder:''); $processStats['success'][$val] = 'Send succeeded to '.$nfn.'<'.$email.'>'.($savefailed?' but failed to store to Folder:'.$_folder:'');