more fixes for delete of tags in a tagset

diff --git a/CRM/Case/Page/AJAX.php b/CRM/Case/Page/AJAX.php
index b05803690f0d6a2d841b1b35eabb692e8829c95f..9fcc5310d98bbd02c88b436377a042bcd812e250 100644 (file)
--- 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 8b52829f41ee11c16de84410b1fce0b577801d61..a4c53f0869100eb7157713046c6ea124003e2cfb 100644 (file)
--- 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;
     }