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

fix: Fixed invalid removal of attributes based on blocked tags using the /attributes/restSearch API

pull/2909/merge
iglocska 2018-03-14 05:31:21 +01:00
parent 824ebb5aea
commit 7df39a5dd1
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Model/Attribute.php
View File

@ -2787,6 +2787,9 @@ class Attribute extends AppModel {
}
if (!empty($tagArray[1])) {
$temp['AND']['NOT'] = $this->__createTagSubQuery($tagArray[1], true);
if ($limitAttributeHitsTo == 'attribute') {
$temp['AND']['NOT'] = $this->__createTagSubQuery($tagArray[1], true, 'Attribute', $limitAttributeHitsTo);
}
}
$conditions['AND'][] = $temp;
return $conditions;