Add tag fields for multiple entities

webform_civicrm.utils.diff

diff --git a/includes/utils.inc b/includes/utils.inc
index dc502c5..97757dc 100644
--- a/includes/utils.inc
+++ b/includes/utils.inc
@@ -806,16 +806,6 @@ function wf_crm_get_fields($var = 'fields') {
       'table' => 'group',
       'expose_list' => TRUE,
     );
-    $tagsets = array('' => t('Tag(s)')) + CRM_Core_BAO_Tag::getTagSet('civicrm_contact');
-    foreach ($tagsets as $pid => $name) {
-      $fields['other_tag' . ($pid ? "_$pid" : '')] = array(
-        'name' => $name,
-        'type' => 'select',
-        'extra' => array('multiple' => 1, 'civicrm_live_options' => 1),
-        'table' => 'tag',
-        'expose_list' => TRUE,
-      );
-    }
     $fields['activity_activity_type_id'] = array(
       'name' => t('Activity # Type'),
       'type' => 'select',
@@ -887,7 +877,9 @@ function wf_crm_get_fields($var = 'fields') {
         'integer' => 1,
       ),
     );
+    $tag_entities = array('other', 'activity');
     if (isset($sets['case'])) {
+      $tag_entities[] = 'case';
       $case_info = new CRM_Case_XMLProcessor_Process();
       $fields['case_case_type_id'] = array(
         'name' => t('Case # Type'),
@@ -968,6 +960,18 @@ function wf_crm_get_fields($var = 'fields') {
         }
       }
     }
+    $tagsets = array('' => t('Tag(s)')) + CRM_Core_BAO_Tag::getTagSet('civicrm_contact');
+    foreach ($tagsets as $pid => $name) {
+      foreach ($tag_entities as $entity) {
+        $fields[$entity . '_tag' . ($pid ? "_$pid" : '')] = array(
+          'name' => $name,
+          'type' => 'select',
+          'extra' => array('multiple' => 1, 'civicrm_live_options' => 1),
+          'table' => 'tag',
+          'expose_list' => TRUE,
+        );
+      }
+    }
     $fields['relationship_relationship_type_id'] = array(
       'name' => t('Relationship Type(s)'),
       'type' => 'select',