From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Wed, 21 Apr 2021 14:09:20 +0000 (-0400)
Subject: simplification
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=dee855fd57320f648d41aa1b79f47f97258cb920;p=civicrm-core.git

simplification
---

diff --git a/CRM/Activity/BAO/Activity.php b/CRM/Activity/BAO/Activity.php
index 05b84c5e0a..0f410c8d80 100644
--- a/CRM/Activity/BAO/Activity.php
+++ b/CRM/Activity/BAO/Activity.php
@@ -2628,8 +2628,6 @@ INNER JOIN  civicrm_option_group grp ON (grp.id = option_group_id AND grp.name =
           // This activity belongs to a case.
           $caseId = current($values['case_id']);
 
-          $activity['subject'] = $values['subject'];
-
           // Get the view and edit (update) links:
           $caseActionLinks =
             $actionLinks = array_intersect_key(
@@ -2676,10 +2674,10 @@ INNER JOIN  civicrm_option_group grp ON (grp.id = option_group_id AND grp.name =
         else {
           // Non-case activity
           $actionLinks = CRM_Activity_Selector_Activity::actionLinks(
-            CRM_Utils_Array::value('activity_type_id', $values),
-            CRM_Utils_Array::value('source_record_id', $values),
+            $values['activity_type_id'] ?? NULL,
+            $values['source_record_id'] ?? NULL,
             !empty($values['mailingId']),
-            CRM_Utils_Array::value('activity_id', $values)
+            $values['activity_id'] ?? NULL
           );
           $actionMask = array_sum(array_keys($actionLinks)) & $mask;