refs #4633 make sure the keyword filter only includes results that were a search, do not display segment icon in subtables of events

1 files changed, 10 insertions, 6 deletions

diff --git a/plugins/Events/API.php b/plugins/Events/API.php
index 345deb4f96..bb6584b777 100644
--- a/plugins/Events/API.php
+++ b/plugins/Events/API.php
@@ -154,13 +154,17 @@ class API extends \Piwik\Plugin\API
         $this->checkSecondaryDimension($name, $secondaryDimension);
         $recordName = $this->getRecordNameForAction($name, $secondaryDimension);
         $dataTable = Archive::getDataTableFromArchive($recordName, $idSite, $period, $date, $segment, $expanded, $idSubtable);
-        $dataTable->filter('AddSegmentValue', array(function ($label) {
-            if ($label === Archiver::EVENT_NAME_NOT_SET) {
-                return false;
-            }
 
-            return $label;
-        }));
+        if (empty($idSubtable)) {
+            $dataTable->filter('AddSegmentValue', array(function ($label) {
+                if ($label === Archiver::EVENT_NAME_NOT_SET) {
+                    return false;
+                }
+
+                return $label;
+            }));
+        }
+
         $this->filterDataTable($dataTable);
         return $dataTable;
     }