From 63b7aefc70c1dfa792d7714c8924baae923fd4fc Mon Sep 17 00:00:00 2001
From: Debarshi Bhaumik <deb1990@gmail.com>
Date: Fri, 18 Jan 2019 12:06:23 +0530
Subject: [PATCH] dev/core#670 - Fix saving of tags in case activity

---
 CRM/Activity/Form/Activity.php | 5 ++---
 CRM/Case/Form/Activity.php     | 6 ++++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 08c1928388..3148c1ce7d 100644
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -1066,9 +1066,8 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
       if (!is_array($params['tag'])) {
         $params['tag'] = explode(',', $params['tag']);
       }
-      foreach ($params['tag'] as $tag) {
-        $tagParams[$tag] = 1;
-      }
+
+      $tagParams = array_fill_keys($params['tag'], 1);
     }
 
     // Save static tags.
diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php
index a1f6809ec3..6e602a3975 100644
--- a/CRM/Case/Form/Activity.php
+++ b/CRM/Case/Form/Activity.php
@@ -543,9 +543,11 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
         // add tags if exists
         $tagParams = array();
         if (!empty($params['tag'])) {
-          foreach ($params['tag'] as $tag) {
-            $tagParams[$tag] = 1;
+          if (!is_array($params['tag'])) {
+            $params['tag'] = explode(',', $params['tag']);
           }
+
+          $tagParams = array_fill_keys($params['tag'], 1);
         }
 
         //save static tags
-- 
2.25.1