dev/core#1827 activity search - fixing search by tags - simple and tag set

diff --git a/CRM/Activity/BAO/Query.php b/CRM/Activity/BAO/Query.php
index d5dd51084f934deb03c2b029b0a38f371ffc32f0..e55cd28d13d165a1cba70e417ba68bab40a3f73e 100644 (file)
--- a/CRM/Activity/BAO/Query.php
+++ b/CRM/Activity/BAO/Query.php
@@ -318,7 +318,7 @@ class CRM_Activity_BAO_Query {
             $val = explode(',', $val);
             foreach ($val as $tId) {
               if (is_numeric($tId)) {
-                $value[$tId] = 1;
+                $value[] = $tId;
               }
             }
           }
@@ -333,10 +333,10 @@ class CRM_Activity_BAO_Query {
 
         $names = [];
         foreach ($value as $k => $v) {
-          $names[] = $activityTags[$k];
+          $names[] = $activityTags[$v];
         }
 
-        $query->_where[$grouping][] = "civicrm_activity_tag.tag_id IN (" . implode(",", array_keys($value)) . ")";
+        $query->_where[$grouping][] = "civicrm_activity_tag.tag_id IN (" . implode(",", $value) . ")";
         $query->_qill[$grouping][] = ts('Activity Tag %1', [1 => $op]) . ' ' . implode(' ' . ts('OR') . ' ', $names);
         $query->_tables['civicrm_activity_tag'] = $query->_whereTables['civicrm_activity_tag'] = 1;
         break;