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

Merge branch 'hotfix-2.3.127'

pull/663/head v2.3.127
iglocska 2015-09-16 15:34:32 +02:00
parent b8fae35f34 14188f1367
commit dfdcc722d6
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.json
View File

@ -1 +1 @@
{"major":2, "minor":3, "hotfix":126} {"major":2, "minor":3, "hotfix":127}

1
app/Model/Attribute.php
View File

@ -1009,6 +1009,7 @@ class Attribute extends AppModel {
'AND' => array( 'AND' => array(
'Attribute.type !=' => $this->nonCorrelatingTypes, 'Attribute.type !=' => $this->nonCorrelatingTypes,
'Attribute.id !=' => $a['id'], 'Attribute.id !=' => $a['id'],
'Attribute.event_id !=' => $a['event_id']
), ),
), ),
'recursive => -1', 'recursive => -1',