mirror of https://github.com/MISP/MISP
Merge branch '2.4' of github.com:MISP/MISP into develop
commit
91b4c4397a
|
@ -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']) {
|
||||
/*
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue