From ca4f7cc87f7c34fb8ffea66e5a15d6a9e910cbcb Mon Sep 17 00:00:00 2001
From: kurund <kurund@civicrm.org>
Date: Thu, 9 Jan 2014 14:10:49 -0800
Subject: [PATCH] more fixes for delete of tags in a tagset

---
 CRM/Case/Page/AJAX.php | 4 +---
 CRM/Core/Form/Tag.php  | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/CRM/Case/Page/AJAX.php b/CRM/Case/Page/AJAX.php
index b05803690f..9fcc5310d9 100644
--- a/CRM/Case/Page/AJAX.php
+++ b/CRM/Case/Page/AJAX.php
@@ -84,9 +84,7 @@ class CRM_Case_Page_AJAX {
       $tagIds = explode(',', $tags);
     }
 
-    $skipEntityDelete = FALSE;
     if (!empty($tagIds)) {
-      $skipEntityDelete = TRUE;
       $params = array(
         'entity_id' => $caseId,
         'entity_table' => 'civicrm_case',
@@ -103,7 +101,7 @@ class CRM_Case_Page_AJAX {
     }
 
     if (!empty($tagList)) {
-      CRM_Core_Form_Tag::postProcess($tagList, $caseId, 'civicrm_case', CRM_Core_DAO::$_nullObject, $skipEntityDelete);
+      CRM_Core_Form_Tag::postProcess($tagList, $caseId, 'civicrm_case', CRM_Core_DAO::$_nullObject);
     }
 
     $session = CRM_Core_Session::singleton();
diff --git a/CRM/Core/Form/Tag.php b/CRM/Core/Form/Tag.php
index 8b52829f41..a4c53f0869 100644
--- a/CRM/Core/Form/Tag.php
+++ b/CRM/Core/Form/Tag.php
@@ -238,13 +238,12 @@ class CRM_Core_Form_Tag {
    * @param int     $entityId    entity id, eg: contact id, activity id, case id, file id
    * @param string  $entityTable entity table
    * @param object  $form        form object
-   * @param boolean $skipDelete  TRUE if you need to skip delete action in tag entity table
    *
    * @return void
    * @access public
    * @static
    */
-  static function postProcess(&$params, $entityId, $entityTable = 'civicrm_contact', &$form, $skipDelete = FALSE) {
+  static function postProcess(&$params, $entityId, $entityTable = 'civicrm_contact', &$form) {
     if ($form && !empty($form->_entityTagValues)) {
       $existingTags = $form->_entityTagValues;
     }
-- 
2.25.1