Merge pull request #4124 from tohojo/adv-search-fix

[civicrm-core.git] / CRM / Core / Form / Tag.php

diff --git a/CRM/Core/Form/Tag.php b/CRM/Core/Form/Tag.php
index f7ffb32f57adb7825b987843948f000a18ed1e66..597c3beae0cdee3d291af0745ce064395ebef023 100644 (file)
--- a/CRM/Core/Form/Tag.php
+++ b/CRM/Core/Form/Tag.php
@@ -43,15 +43,15 @@ class CRM_Core_Form_Tag {
   /**
    * Function to build tag widget if correct parent is passed
    *
-   * @param CRM_Core_Form  $form form object
-   * @param string  $parentNames parent name ( tag name)
-   * @param string  $entityTable entitytable 'eg: civicrm_contact'
-   * @param int     $entityId    entityid  'eg: contact id'
+   * @param CRM_Core_Form $form form object
+   * @param string $parentNames parent name ( tag name)
+   * @param string $entityTable entitytable 'eg: civicrm_contact'
+   * @param int $entityId entityid  'eg: contact id'
    * @param boolean $skipTagCreate true if tag need be created using ajax
    * @param boolean $skipEntityAction true if need to add entry in entry table via ajax
-   * @param boolean $searchMode true if widget is used in search eg: advanced search
-   * @param string  $tagsetElementName if you need to create tagsetlist with specific name
+   * @param string $tagsetElementName if you need to create tagsetlist with specific name
    *
+   * @internal param bool $searchMode true if widget is used in search eg: advanced search
    * @return void
    * @access public
    * @static
@@ -141,7 +141,8 @@ class CRM_Core_Form_Tag {
       // in that case we create empty tagset params so that below logic works and tagset are
       // deleted correctly
       foreach ($form->_tagsetInfo as $tagsetName => $tagsetInfo) {
-        $tagsetId = substr($tagsetName, strlen('parentId_'));
+        $tagsetId = explode('parentId_', $tagsetName);
+        $tagsetId = $tagsetId[1];
         if (empty($params[$tagsetId])) {
           $params[$tagsetId] = '';
         }
@@ -152,31 +153,12 @@ class CRM_Core_Form_Tag {
     // are deleted we will have to set $params[tagset id] = '' which is done by above logic
     foreach ($params as $parentId => $value) {
       $newTagIds = array();
-      $realTagIds = array();
+      $tagIds = array();
 
       if ($value) {
-        $tagsIDs = explode(',', $value);
-        foreach ($tagsIDs as $tagId) {
-          if (!is_numeric($tagId)) {
-            // check if user has selected existing tag or is creating new tag
-            // this is done to allow numeric tags etc.
-            $tagValue = explode(':::', $tagId);
-
-            if (isset($tagValue[1]) && $tagValue[1] == 'value') {
-              $tagParams = array(
-                'name' => $tagValue[0],
-                'parent_id' => $parentId,
-              );
-              $tagObject = CRM_Core_BAO_Tag::add($tagParams, CRM_Core_DAO::$_nullArray);
-              $tagId = $tagObject->id;
-            }
-          }
-
-          $realTagIds[] = $tagId;
-          if ($form && $form->_action != CRM_Core_Action::UPDATE) {
-            $newTagIds[] = $tagId;
-          }
-          elseif (!array_key_exists($tagId, $existingTags)) {
+        $tagIds = explode(',', $value);
+        foreach ($tagIds as $tagId) {
+          if ($form && $form->_action != CRM_Core_Action::UPDATE || !array_key_exists($tagId, $existingTags)) {
             $newTagIds[] = $tagId;
           }
         }
@@ -188,8 +170,8 @@ class CRM_Core_Form_Tag {
                     WHERE civicrm_tag.id=civicrm_entity_tag.tag_id
                       AND civicrm_entity_tag.entity_table='{$entityTable}'
                       AND entity_id={$entityId} AND parent_id={$parentId}";
-      if (!empty($realTagIds)) {
-        $deleteSQL .= " AND tag_id NOT IN (" . implode(', ', $realTagIds) . ");";
+      if (!empty($tagIds)) {
+        $deleteSQL .= " AND tag_id NOT IN (" . implode(', ', $tagIds) . ");";
       }
 
       CRM_Core_DAO::executeQuery($deleteSQL);