simplification

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 4fe6e482c52d7b691aa4ead106500ad9e4456dd6..05b84c5e0ac5add19e7fc05d6db62602c2f7f72d 100644 (file)
--- 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 4ddefe0bab2892fc59593c3bb56007b0936694be..9d991924bd610ce2b2d31fdde01be0ca9a1da531 100644 (file)
--- 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
       );