From cdd5f82aff0af30dba13c260dda273268e91bbcf Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Sun, 12 May 2019 06:37:18 +1000 Subject: [PATCH] Proper fix tests --- CRM/Activity/BAO/Activity.php | 2 +- api/v3/Activity.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 5d4ca14c2f..3f1f37b6e3 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -766,7 +766,7 @@ class CRM_Activity_BAO_Activity extends CRM_Activity_DAO_Activity { 'subject' => CRM_Utils_Array::value('subject', $activity), 'assignee_contact_name' => CRM_Utils_Array::value('assignee_contact_sort_name', $activity, []), 'source_contact_id' => CRM_Utils_Array::value('source_contact_id', $activity), - 'source_contact_name' => CRM_Utils_Array::value('source_contact_name', $activity), + 'source_contact_name' => CRM_Utils_Array::value('source_contact_sort_name', $activity), ]; $activities[$id]['activity_type_name'] = CRM_Core_PseudoConstant::getName('CRM_Activity_BAO_Activity', 'activity_type_id', $activity['activity_type_id']); $activities[$id]['activity_type'] = CRM_Core_PseudoConstant::getLabel('CRM_Activity_BAO_Activity', 'activity_type_id', $activity['activity_type_id']); diff --git a/api/v3/Activity.php b/api/v3/Activity.php index 140452f035..4aa31a9da1 100644 --- a/api/v3/Activity.php +++ b/api/v3/Activity.php @@ -664,8 +664,8 @@ function _civicrm_api3_activity_fill_activity_contact_names(&$activities, $param } else { $activities[$activityContact['activity_id']]['source_contact_id'] = $contactID; - $activities[$activityContact['activity_id']]['source_contact_name'] = isset($activityContact['contact_id.sort_name']) ? $activityContact['contact_id.sort_name'] : ''; - $activities[$activityContact['activity_id']]['source_contact_display_name'] = isset($activityContact['contact_id.display_name']) ? $activityContact['contact_id.display_name'] : ''; + $activities[$activityContact['activity_id']]['source_contact_name'] = isset($activityContact['contact_id.display_name']) ? $activityContact['contact_id.display_name'] : ''; + $activities[$activityContact['activity_id']]['source_contact_sort_name'] = isset($activityContact['contact_id.sort_name']) ? $activityContact['contact_id.sort_name'] : ''; } } } -- 2.25.1