From 2543f38b82d7f5929f0f1637a854914aa3e8b68d Mon Sep 17 00:00:00 2001
From: Bradley Taylor <hello@brad-taylor.co.uk>
Date: Sat, 2 Apr 2022 18:25:32 +0100
Subject: [PATCH] Avoid PHP notices in activity search

---
 CRM/Activity/Selector/Search.php               | 4 ++++
 tests/phpunit/CRM/Activity/Form/SearchTest.php | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/CRM/Activity/Selector/Search.php b/CRM/Activity/Selector/Search.php
index bb56feaafc..14215f6adc 100644
--- a/CRM/Activity/Selector/Search.php
+++ b/CRM/Activity/Selector/Search.php
@@ -249,6 +249,9 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
         if (isset($result->$property)) {
           $row[$property] = $result->$property;
         }
+        else {
+          $row[$property] = NULL;
+        }
       }
 
       $contactId = $row['contact_id'] ?? NULL;
@@ -273,6 +276,7 @@ class CRM_Activity_Selector_Search extends CRM_Core_Selector_Base implements CRM
         $row['activity_type'] = CRM_Core_TestEntity::appendTestText($row['activity_type']);
       }
       $row['mailingId'] = '';
+      $row['recipients'] = '';
       if (
         $accessCiviMail &&
         ($mailingIDs === TRUE || in_array($result->source_record_id, $mailingIDs)) &&
diff --git a/tests/phpunit/CRM/Activity/Form/SearchTest.php b/tests/phpunit/CRM/Activity/Form/SearchTest.php
index c1e73def18..138195031f 100644
--- a/tests/phpunit/CRM/Activity/Form/SearchTest.php
+++ b/tests/phpunit/CRM/Activity/Form/SearchTest.php
@@ -64,6 +64,10 @@ class CRM_Activity_Form_SearchTest extends CiviUnitTestCase {
         'campaign' => NULL,
         'campaign_id' => NULL,
         'repeat' => '',
+        'contact_sub_type' => NULL,
+        'activity_campaign_id' => NULL,
+        'activity_engagement_level' => NULL,
+        'recipients' => '',
       ],
     ], $rows);
   }
-- 
2.25.1