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

chg: [internal] Merge EventReports for extended view

pull/6417/head
Jakub Onderka 2020-10-10 14:17:20 +02:00
parent c46db527f6
commit 150ccfcd73
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Model/Event.php
View File

@ -2597,6 +2597,10 @@ class Event extends AppModel
foreach ($thingsToMerge as $thingToMerge) {
$event[$thingToMerge] = array_merge($event[$thingToMerge], $extensionEvent[$thingToMerge]);
}
// Merge event reports if requested
if (!$options['noEventReports']) {
$event['EventReport'] = array_merge($event['EventReport'], $extensionEvent['EventReport']);
}
// Merge just tags that are not already in main event
foreach ($extensionEvent['EventTag'] as $eventTag) {
foreach ($event['EventTag'] as $eT) {