From f2e0e24c0c7f438cc1ed74b10434b0a35e492ee2 Mon Sep 17 00:00:00 2001 From: demeritcowboy Date: Mon, 19 Apr 2021 21:52:23 -0400 Subject: [PATCH] simplification --- CRM/Activity/BAO/Activity.php | 6 +----- CRM/Activity/Selector/Activity.php | 9 ++------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php index 4fe6e482c5..05b84c5e0a 100644 --- a/CRM/Activity/BAO/Activity.php +++ b/CRM/Activity/BAO/Activity.php @@ -2620,10 +2620,6 @@ INNER JOIN civicrm_option_group grp ON (grp.id = option_group_id AND grp.name = // build links $activity['links'] = ''; - $accessMailingReport = FALSE; - if (!empty($values['mailingId'])) { - $accessMailingReport = TRUE; - } // Get action links. @@ -2682,7 +2678,7 @@ INNER JOIN civicrm_option_group grp ON (grp.id = option_group_id AND grp.name = $actionLinks = CRM_Activity_Selector_Activity::actionLinks( CRM_Utils_Array::value('activity_type_id', $values), CRM_Utils_Array::value('source_record_id', $values), - $accessMailingReport, + !empty($values['mailingId']), CRM_Utils_Array::value('activity_id', $values) ); $actionMask = array_sum(array_keys($actionLinks)) & $mask; diff --git a/CRM/Activity/Selector/Activity.php b/CRM/Activity/Selector/Activity.php index 4ddefe0bab..9d991924bd 100644 --- a/CRM/Activity/Selector/Activity.php +++ b/CRM/Activity/Selector/Activity.php @@ -412,15 +412,10 @@ class CRM_Activity_Selector_Activity extends CRM_Core_Selector_Base implements C $row['engagement_level'] = CRM_Utils_Array::value($engagementLevel, $engagementLevels, $engagementLevel); } - // CRM-3553 - $accessMailingReport = FALSE; - if (!empty($row['mailingId'])) { - $accessMailingReport = TRUE; - } - $actionLinks = $this->actionLinks(CRM_Utils_Array::value('activity_type_id', $row), CRM_Utils_Array::value('source_record_id', $row), - $accessMailingReport, + // CRM-3553 + !empty($row['mailingId']), CRM_Utils_Array::value('activity_id', $row), $this->_key ); -- 2.25.1