Merge pull request #13486 from deb1990/core-670-fix-activity-tags

(WIP) dev/core#670 - Fix Saving of Case Activity tags
civicrm · Jan 21, 2019 · bf6eb37 · bf6eb37
2 parents d0fe005 + 63b7aef
commit bf6eb37
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
@@ -1066,9 +1066,8 @@ protected function processActivity(&$params) {
       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
@@ -543,9 +543,11 @@ public function postProcess($params = NULL) {
         // 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