MISP
/
MISP
mirror of https://github.com/MISP/MISP
2
2
Fork 0
Code Issues Releases Wiki Activity

fix: [bug] Fixed e-mailing bug introduced during the refactoring

pull/3535/head
iglocska 2018-08-05 18:14:25 +02:00
parent cb900d7a1f
commit 0e1b058ac9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/User.php
View File

@ -788,7 +788,7 @@ class User extends AppModel
}
$replyToLog = '';
if (!$failed) {
$this->__finaliseAndSendEmail($replyToUser, $Email, $replyToLog, $user, $subject, $body);
$result = $this->__finaliseAndSendEmail($replyToUser, $Email, $replyToLog, $user, $subject, $body);
}
$this->Log = ClassRegistry::init('Log');
$this->Log->create();
@ -840,7 +840,7 @@ class User extends AppModel
$Email->emailFormat('text');
$result = $Email->send($body);
$Email->reset();
return true;
return $result;
}
private function __encryptUsingGPG(&$Email, &$body, $subject, $user)