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

Further fixes to the contact e-mail

pull/909/head
Iglocska 2016-02-02 18:19:09 +01:00
parent a69364f786
commit b8591674ef
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Command/EventShell.php
View File

@ -275,7 +275,7 @@ class EventShell extends AppShell
$this->Job->id = $processId;
$user = $this->User->getAuthUser($userId);
$eventId = $this->args[2];
$result = $this->Event->sendContactEmail($id, $message, $all, $user, $isSiteAdmin);
$result = $this->Event->sendContactEmail($id, $message, $all, array('User' => $user), $isSiteAdmin);
$this->Job->saveField('progress', '100');
if ($result != true) $this->Job->saveField('message', 'Job done.');
}

3
app/Model/Event.php
View File

@ -2249,8 +2249,7 @@ class Event extends AppModel {
$job->saveField('process_id', $process_id);
return true;
} else {
$userMod['User'] = $user;
$result = $this->sendContactEmail($id, $message, $creator_only, $userMod, $isSiteAdmin);
$result = $this->sendContactEmail($id, $message, $creator_only, array('User' => $user), $isSiteAdmin);
return $result;
}
}