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

Merge branch '2.4' of github.com:MISP/MISP into develop

pull/9432/head
Sami Mokaddem 2023-11-27 11:24:39 +01:00
parent 7179557623 d758516042
commit 91b4c4397a
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Model/Attribute.php
View File

@ -2712,7 +2712,7 @@ class Attribute extends AppModel
}
$attributeId = $this->updateLookupTable[$attribute['uuid']];
if (!empty($attribute['Sighting'])) {
$this->Sighting->captureSightings($attribute['Sighting'], $this->id, $eventId, $user);
$this->Sighting->captureSightings($attribute['Sighting'], $attributeId, $eventId, $user);
}
if ($user['Role']['perm_tagger']) {
/*

2
app/Model/Sighting.php
View File

@ -152,7 +152,7 @@ class Sighting extends AppModel
$toSave = [];
foreach ($sightings as $sighting) {
if (isset($existingSighting[$sighting['uuid']])) {
if (!empty($sighting['uuid']) && isset($existingSighting[$sighting['uuid']])) {
continue; // already exists, skip
}