clean up(CRM-12274)

[civicrm-core.git] / CRM / Activity / Form / Task / PickOption.php

diff --git a/CRM/Activity/Form/Task/PickOption.php b/CRM/Activity/Form/Task/PickOption.php
index b80b85883d854027460f9fc0c393e4d759bcada0..73a9ffbd7d42c44f86f2b3eacec676053c1b0639 100644 (file)
--- a/CRM/Activity/Form/Task/PickOption.php
+++ b/CRM/Activity/Form/Task/PickOption.php
@@ -149,17 +149,21 @@ class CRM_Activity_Form_Task_PickOption extends CRM_Activity_Form_Task {
     $this->controller->resetPage('Email');
     $params = $this->exportValues();
     $this->_contacts = array();
+    
+    $activityContacts = CRM_Core_PseudoConstant::activityContacts('name');
+    $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts);
+    $targetID = CRM_Utils_Array::key('Activity Targets', $activityContacts); 
     //get assignee contacts
     if (!empty($params['assigned_to'])) {
       foreach ($this->_activityHolderIds as $key => $id) {
-        $ids = array_keys(CRM_Activity_BAO_ActivityAssignment::getAssigneeNames($id));
+        $ids = array_keys(CRM_Activity_BAO_ActivityContact::getNames($id, $assigneeID));
         $this->_contacts = array_merge($this->_contacts, $ids);
       }
     }
     //get target contacts
     if (!empty($params['with_contact'])) {
       foreach ($this->_activityHolderIds as $key => $id) {
-        $ids = array_keys(CRM_Activity_BAO_ActivityTarget::getTargetNames($id));
+        $ids = array_keys(CRM_Activity_BAO_ActivityContact::getNames($id, $targetID));
         $this->_contacts = array_merge($this->_contacts, $ids);
       }
     }