Dereku/snappymail
1
0
Fork 0
mirror of https://github.com/the-djmaze/snappymail.git synced 2026-08-25 18:19:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix duplicate messages in the Drafts folder.

Browse source
This commit is contained in:
RainLoop Team 2013-12-12 23:33:41 +04:00
parent abc821c461
commit be150d7fc9
5 changed files with 16 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rainloop/v/0.0.0/app/libraries/RainLoop/Actions.php
View file

@ -3527,11 +3527,10 @@ class Actions
/**
* @param \RainLoop\Account $oAccount
* @param bool $bWithDraftInfo = true
* @param string $sMessageID = ''
*
* @return \MailSo\Mime\Message
*/
private function buildMessage($oAccount, $bWithDraftInfo = true, $sMessageID = '')
private function buildMessage($oAccount, $bWithDraftInfo = true)
{
$sFrom = $this->GetActionParam('From', '');
$sTo = $this->GetActionParam('To', '');
@ -3547,14 +3546,7 @@ class Actions
$sReferences = $this->GetActionParam('References', '');
$oMessage = \MailSo\Mime\Message::NewInstance();
if (empty($sMessageID))
{
$oMessage->RegenerateMessageId();
}
else
{
$oMessage->SetMessageId($sMessageID);
}
$oMessage->RegenerateMessageId();
$oMessage->SetXMailer('RainLoop/'.APP_VERSION);
@ -3696,7 +3688,6 @@ class Actions
$sMessageFolder = $this->GetActionParam('MessageFolder', '');
$sMessageUid = $this->GetActionParam('MessageUid', '');
$sMessageID = $this->GetActionParam('MessageID', '');
$sDraftFolder = $this->GetActionParam('DraftFolder', '');
if (0 === strlen($sDraftFolder))
@ -3704,7 +3695,7 @@ class Actions
throw new \RainLoop\Exceptions\ClientException(\RainLoop\Notifications::UnknownError);
}
$oMessage = $this->buildMessage($oAccount, true, $sMessageID);
$oMessage = $this->buildMessage($oAccount, true);
$this->Plugins()
->RunHook('filter.save-message', array(&$oMessage))
@ -3747,8 +3738,7 @@ class Actions
{
$mResult = array(
'NewFolder' => $sDraftFolder,
'NewUid' => $iNewUid,
'NewID' => $sMessageId
'NewUid' => $iNewUid
);
}
}
@ -3766,11 +3756,10 @@ class Actions
$sDraftFolder = $this->GetActionParam('MessageFolder', '');
$sDraftUid = $this->GetActionParam('MessageUid', '');
$sMessageID = $this->GetActionParam('MessageID', '');
$sSentFolder = $this->GetActionParam('SentFolder', '');
$aDraftInfo = $this->GetActionParam('DraftInfo', null);
$oMessage = $this->buildMessage($oAccount, false, $sMessageID);
$oMessage = $this->buildMessage($oAccount, false);
$this->Plugins()
->RunHook('filter.send-message', array(&$oMessage))