From 4dff5e171c47df30c0eca6e27d2bca71d5776e42 Mon Sep 17 00:00:00 2001
From: dskallman <dana@tadpole.cc>
Date: Wed, 30 Apr 2014 14:58:49 -0700
Subject: [PATCH] CRM-13966 - Cleanup tagset function signature

----------------------------------------
* CRM-13966: Migrate asmSelect, tokeninput and autocompletes to use Select2
  https://issues.civicrm.org/jira/browse/CRM-13966
---
 CRM/Activity/Form/Task/RemoveFromTag.php | 2 +-
 CRM/Case/BAO/Query.php                   | 2 +-
 CRM/Contact/Form/Search/Criteria.php     | 2 +-
 CRM/Contact/Form/Task/RemoveFromTag.php  | 2 +-
 CRM/Core/BAO/File.php                    | 2 +-
 CRM/Core/Form/Tag.php                    | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CRM/Activity/Form/Task/RemoveFromTag.php b/CRM/Activity/Form/Task/RemoveFromTag.php
index 3c37f1ee3e..49133f69c3 100644
--- a/CRM/Activity/Form/Task/RemoveFromTag.php
+++ b/CRM/Activity/Form/Task/RemoveFromTag.php
@@ -67,7 +67,7 @@ class CRM_Activity_Form_Task_RemoveFromTag extends CRM_Activity_Form_Task {
     }
 
     $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_activity');
-    CRM_Core_Form_Tag::buildQuickForm($this, $parentNames, 'civicrm_activity', NULL, TRUE, FALSE, TRUE);
+    CRM_Core_Form_Tag::buildQuickForm($this, $parentNames, 'civicrm_activity', NULL, TRUE, FALSE);
 
     $this->addDefaultButtons(ts('Remove Tags from activities'));
   }
diff --git a/CRM/Case/BAO/Query.php b/CRM/Case/BAO/Query.php
index 14e6a1e31b..664bb841cd 100644
--- a/CRM/Case/BAO/Query.php
+++ b/CRM/Case/BAO/Query.php
@@ -711,7 +711,7 @@ case_relation_type.id = case_relationship.relationship_type_id )";
     }
 
     $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_case');
-    CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_case', NULL, TRUE, FALSE, TRUE);
+    CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_case', NULL, TRUE, FALSE);
 
     if (CRM_Core_Permission::check('administer CiviCRM')) {
       $form->addElement('checkbox', 'case_deleted', ts('Deleted Cases'));
diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index a3d8f28167..1681d4c11c 100644
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -78,7 +78,7 @@ class CRM_Contact_Form_Search_Criteria {
       }
 
       $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_contact');
-      CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_contact', NULL, TRUE, FALSE, TRUE);
+      CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_contact', NULL, TRUE, FALSE);
 
       $used_for = CRM_Core_OptionGroup::values('tag_used_for');
       $tagsTypes = array();
diff --git a/CRM/Contact/Form/Task/RemoveFromTag.php b/CRM/Contact/Form/Task/RemoveFromTag.php
index e59dd5ff6f..863494c295 100644
--- a/CRM/Contact/Form/Task/RemoveFromTag.php
+++ b/CRM/Contact/Form/Task/RemoveFromTag.php
@@ -67,7 +67,7 @@ class CRM_Contact_Form_Task_RemoveFromTag extends CRM_Contact_Form_Task {
     }
 
     $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_contact');
-    CRM_Core_Form_Tag::buildQuickForm($this, $parentNames, 'civicrm_contact', NULL, TRUE, FALSE, TRUE);
+    CRM_Core_Form_Tag::buildQuickForm($this, $parentNames, 'civicrm_contact', NULL, TRUE, FALSE);
 
     $this->addDefaultButtons(ts('Remove Tags from Contacts'));
   }
diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index 475f668c66..8c515cb5f1 100644
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -393,7 +393,7 @@
      }
 
      // build tagset widget
-     CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_file', NULL, TRUE, TRUE, FALSE);
+     CRM_Core_Form_Tag::buildQuickForm($form, $parentNames, 'civicrm_file', NULL, TRUE, TRUE);
    }
 
    /**
diff --git a/CRM/Core/Form/Tag.php b/CRM/Core/Form/Tag.php
index 52399b78b6..cbe2f38b96 100644
--- a/CRM/Core/Form/Tag.php
+++ b/CRM/Core/Form/Tag.php
@@ -57,7 +57,7 @@ class CRM_Core_Form_Tag {
    * @static
    */
   static function buildQuickForm(&$form, $parentNames, $entityTable, $entityId = NULL, $skipTagCreate = FALSE,
-    $skipEntityAction = FALSE, $searchMode = FALSE, $tagsetElementName = NULL ) {
+    $skipEntityAction = FALSE, $tagsetElementName = NULL ) {
     $tagset = $form->_entityTagValues = array();
     $form->assign("isTagset", FALSE);
     $mode = NULL;
-- 
2.25.1