CRM-15180, added support for attachments and some wierd error fixes

----------------------------------------
* CRM-15180: Using the taglist style of the "contact" page for the "new contact" page
  https://issues.civicrm.org/jira/browse/CRM-15180

diff --git a/CRM/Activity/Form/Activity.php b/CRM/Activity/Form/Activity.php
index 0b5d13fcb2ae4002317a1e668943f5b38233b8e1..5251de5cca6321ad48e885f170a88e8ef9855840 100644 (file)
--- a/CRM/Activity/Form/Activity.php
+++ b/CRM/Activity/Form/Activity.php
@@ -738,8 +738,7 @@ class CRM_Activity_Form_Activity extends CRM_Contact_Form_Task {
     $this->assign('customDataSubType', $this->_activityTypeId);
     $this->assign('entityID', $this->_activityId);
 
-    $tags = CRM_Core_BAO_Tag::getTags('civicrm_activity',
-      CRM_Core_DAO::$_nullArray, NULL,
+    CRM_Core_BAO_Tag::getTags('civicrm_activity', $tags, NULL,
       '  ', TRUE);
 
     if (!empty($tags)) {

diff --git a/CRM/Case/Form/Case.php b/CRM/Case/Form/Case.php
index 07529edabf28acf30328b08bc16c29821f3e0350..70ee083b796961e854dff1bc822743d1a6d8fccd 100644 (file)
--- a/CRM/Case/Form/Case.php
+++ b/CRM/Case/Form/Case.php
@@ -266,8 +266,7 @@ class CRM_Case_Form_Case extends CRM_Core_Form {
         'maxlength' => '128')), TRUE
     );
 
-    $tags = CRM_Core_BAO_Tag::getTags('civicrm_case',
-      CRM_Core_DAO::$_nullArray, NULL,
+    CRM_Core_BAO_Tag::getTags('civicrm_case', $tags, NULL,
       '  ', TRUE);
 
     if (!empty($tags)) {

diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index e888505821be16912434663044fb6d8e713f5749..660303a848673252d86501e3deb0fe35ef75f994 100644 (file)
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -419,7 +419,8 @@ AND       CEF.entity_id    = %2";
 
     $form->assign('numAttachments', $numAttachments);
 
-    $tags = CRM_Core_BAO_Tag::getTags('civicrm_file');
+    CRM_Core_BAO_Tag::getTags('civicrm_file', $tags, NULL,
+      '  ', TRUE);
 
     // get tagset info
     $parentNames = CRM_Core_BAO_Tag::getTagSet('civicrm_file');