From 669c8ba631144c024a0838171c2f89a280471af7 Mon Sep 17 00:00:00 2001 From: Tyrell Cook Date: Mon, 28 Apr 2014 14:09:50 -0400 Subject: [PATCH] implemnted patch and fixed bulk email name change possibility --- CRM/Activity/Selector/Search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php index 7c1eba8cf6..886c0455d4 100644 --- a/CRM/Activity/Selector/Search.php +++ b/CRM/Activity/Selector/Search.php @@ -286,12 +286,12 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM $result->contact_sub_type : $result->contact_type, FALSE, $result->contact_id ); $accessMailingReport = FALSE; - $activityType = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'name', TRUE); + $activityType = CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'label', TRUE); $activityTypeId = CRM_Utils_Array::key($row['activity_type'], $activityType); if ($row['activity_is_test']) { $row['activity_type'] = $row['activity_type'] . " (test)"; } - $bulkActivityTypeID = CRM_Utils_Array::key('Bulk Email', $activityType); + $bulkActivityTypeID = CRM_Utils_Array::key('Bulk Email', CRM_Core_PseudoConstant::activityType(TRUE, TRUE, FALSE, 'name', TRUE)); $row['mailingId'] = ''; if ( $accessCiviMail && -- 2.25.1