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

fix: [internal] Explicit conditions to avoid ambiguous lookups

pull/4877/head
iglocska 2019-07-14 08:24:10 +02:00
parent ef19b8c06c
commit 91a58c9682
No known key found for this signature in database
GPG Key ID: BEA224F1FEF113AC
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Model/ShadowAttribute.php
View File

@ -486,13 +486,13 @@ class ShadowAttribute extends AppModel
{
$oldsa = $this->find('first', array(
'conditions' => array(
'event_uuid' => $sa['event_uuid'],
'uuid' => $sa['uuid'],
'value' => $sa['value'],
'type' => $sa['type'],
'category' => $sa['category'],
'to_ids' => $sa['to_ids'],
'comment' => $sa['comment']
'ShadowAttribute.event_uuid' => $sa['event_uuid'],
'ShadowAttribute.uuid' => $sa['uuid'],
'ShadowAttribute.value' => $sa['value'],
'ShadowAttribute.type' => $sa['type'],
'ShadowAttribute.category' => $sa['category'],
'ShadowAttribute.to_ids' => $sa['to_ids'],
'ShadowAttribute.comment' => $sa['comment']
),
));
if (empty($oldsa)) {
@ -628,7 +628,7 @@ class ShadowAttribute extends AppModel
$this->delete($oldsa['id']);
}
if (isset($proposal['old_id'])) {
$oldAttribute = $this->Attribute->find('first', array('recursive' => -1, 'conditions' => array('uuid' => $proposal['uuid'])));
$oldAttribute = $this->Attribute->find('first', array('recursive' => -1, 'conditions' => array('Attribute.uuid' => $proposal['uuid'])));
if ($oldAttribute) {
$proposal['old_id'] = $oldAttribute['Attribute']['id'];
} else {