From bef72f94651611bd8a4204380d95505abab33810 Mon Sep 17 00:00:00 2001
From: iglocska <andras.iklody@gmail.com>
Date: Tue, 20 Nov 2018 19:53:02 +0100
Subject: [PATCH] fix: [API] Fix non exportable tags being included in the
 attribute level restsearch

---
 app/Model/Attribute.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index 05a81a361..946c49cfc 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -2898,6 +2898,20 @@ class Attribute extends AppModel
                 }
             }
             $results = $this->find('all', $params);
+			foreach ($results as $k => $result) {
+				if (!empty($result['AttributeTag'])) {
+					$tagCulled = false;
+					foreach ($result['AttributeTag'] as $k2 => $at) {
+						if (empty($at['Tag'])) {
+							unset($results[$k]['AttributeTag'][$k2]);
+							$tagCulled = true;
+						}
+					}
+					if ($tagCulled) {
+						$results[$k]['AttributeTag'] = array_values($results[$k]['AttributeTag']);
+					}
+				}
+			}
             if (!$loop) {
                 if (!empty($params['limit']) && count($results) < $params['limit']) {
                     $continue = false;
@@ -3764,7 +3778,7 @@ class Attribute extends AppModel
 				'fields' => array('Attribute.*', 'Event.org_id', 'Event.distribution'),
 				'withAttachments' => !empty($filters['withAttachments']) ? $filters['withAttachments'] : 0,
 				'enforceWarninglist' => !empty($filters['enforceWarninglist']) ? $filters['enforceWarninglist'] : 0,
-				'includeAllTags' => true,
+				'includeAllTags' => !empty($filters['includeAllTags']) ? $filters['includeAllTags'] : 0,
 				'flatten' => 1,
 				'includeEventUuid' => !empty($filters['includeEventUuid']) ? $filters['includeEventUuid'] : 0,
 				'includeEventTags' => !empty($filters['includeEventTags']) ? $filters['includeEventTags'] : 0
@@ -3852,5 +3866,5 @@ class Attribute extends AppModel
 		}
 		return true;
 	}
-	
+
 }