Merge pull request #25169 from demeritcowboy/act-targ-value

E_NOTICES on activity view
civicrm · Dec 14, 2022 · a8de2f4 · a8de2f4
2 parents 595beb4 + 9b1d661
commit a8de2f4
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/CRM/Activity/Form/ActivityView.php b/CRM/Activity/Form/ActivityView.php
@@ -83,6 +83,11 @@ public function preProcess() {
       }
     }
 
+    // ensure these are set so that they get assigned to the template
+    $values['mailingId'] = $values['mailingId'] ?? NULL;
+    $values['campaign'] = $values['campaign'] ?? NULL;
+    $values['engagement_level'] = $values['engagement_level'] ?? NULL;
+
     // Get the campaign.
     if ($campaignId = CRM_Utils_Array::value('campaign_id', $defaults)) {
       $campaigns = CRM_Campaign_BAO_Campaign::getCampaigns($campaignId);

diff --git a/tests/phpunit/CRM/Activity/Form/ActivityViewTest.php b/tests/phpunit/CRM/Activity/Form/ActivityViewTest.php
@@ -73,6 +73,9 @@ public function testActivityViewPreProcess(): void {
       'modified_date' => $activityMoreInfo['modified_date'],
       'activity_modified_date' => $activityMoreInfo['modified_date'],
       'attachment' => NULL,
+      'mailingId' => NULL,
+      'campaign' => NULL,
+      'engagement_level' => NULL,
     ];
 
     $this->assertEquals($expected, $templateVar);