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

Merge pull request #1203 from sfossen/patch-23 

allow related events to send org uuid, since events send them already
pull/1205/head
Andras Iklody 2016-06-03 21:32:24 +02:00
parent 0117752901 399a86c8fe
commit 55ff877d26
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/Event.php
View File

@ -508,8 +508,7 @@ class Event extends AppModel {
// now look up the event data for these attributes
$conditions = array("Event.id" => $relatedEventIds);
$fields = array('id', 'date', 'threat_level_id', 'info', 'published', 'uuid', 'analysis', 'timestamp', 'distribution', 'org_id', 'orgc_id');
$orgfields = array('id', 'name');
if ($user['Role']['perm_site_admin']) $orgfields[] = 'uuid';
$orgfields = array('id', 'name', 'uuid');
$relatedEvents = $this->find('all',
array('conditions' => $conditions,
'recursive' => 0,