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

2019-11-20 15:32:56 +01:00 · 2019-11-20 15:32:56 +01:00 · 700dd97757
parent a1dcfb1931 3a8d283e46
commit 700dd97757
1 changed files with 1 additions and 0 deletions
--- a/app/Model/AttributeTag.php
+++ b/app/Model/AttributeTag.php
@ -172,6 +172,7 @@ class AttributeTag extends AppModel
        $attributes = $this->Attribute->fetchAttributes($user, array(
            'conditions' => $conditions,
            'flatten' => 1,
+            'includeAllTags' => 1
        ));

        if (empty($attributes)) {