clean up(CRM-12274)

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

diff --git a/CRM/Case/Form/Activity.php b/CRM/Case/Form/Activity.php
index 393e3acd79fee0a4128ef1cdd5e5ed059feecd29..4889b72f051bad670040b5e13ea9d14ff3c7401e 100644 (file)
--- a/CRM/Case/Form/Activity.php
+++ b/CRM/Case/Form/Activity.php
@@ -605,7 +605,7 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
       //while sending a copy.CRM-4509.
       $activityAssigned = array_flip($params['assignee_contact_id']);
       $activityId       = isset($this->_activityId) ? $this->_activityId : $activity->id;
-      $assigneeContacts = CRM_Activity_BAO_ActivityAssignment::getAssigneeNames($activityId);
+      $assigneeContacts = CRM_Activity_BAO_ActivityContact::getNames($activityId, $assigneeID);
       $activityAssigned = array_diff_key($activityAssigned, $assigneeContacts);
 
       foreach ($params['assignee_contact_id'] as $key => $id) {
@@ -628,7 +628,8 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
     //CRM-5695
     //check for notification settings for assignee contacts
     $selectedContacts = array('contact_check');
-
+    $activityContacts = CRM_Core_PseudoConstant::activityContacts('name');
+    $assigneeID = CRM_Utils_Array::key('Activity Assignees', $activityContacts);
     if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME,
         'activity_assignee_notification'
       )) {
@@ -641,7 +642,7 @@ class CRM_Case_Form_Activity extends CRM_Activity_Form_Activity {
           $mailStatus = ts("A copy of the activity has also been sent to selected contacts(s).");
         }
         else {
-          $this->_relatedContacts = CRM_Activity_BAO_ActivityAssignment::getAssigneeNames($activity->id, TRUE, FALSE);
+          $this->_relatedContacts = CRM_Activity_BAO_ActivityContact::getNames($activity->id, $assigneeID, TRUE, FALSE);
           $mailStatus .= ' ' . ts("A copy of the activity has also been sent to assignee contacts(s).");
         }
         //build an associative array with unique email addresses.