From 4cf49d40fc227afc2146953740345179d5fcb7eb Mon Sep 17 00:00:00 2001 From: Seamus Lee Date: Fri, 19 Jun 2020 17:41:59 +1000 Subject: [PATCH] [REF] Fix Compatability issue with flexmailer caused by the PHP7.4 fix --- CRM/Mailing/ActionTokens.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Mailing/ActionTokens.php b/CRM/Mailing/ActionTokens.php index b50dd766cc..ecb3be4dd4 100644 --- a/CRM/Mailing/ActionTokens.php +++ b/CRM/Mailing/ActionTokens.php @@ -82,10 +82,10 @@ class CRM_Mailing_ActionTokens extends \Civi\Token\AbstractTokenSubscriber { list($verp, $urls) = CRM_Mailing_BAO_Mailing::getVerpAndUrls( $row->context['mailingJobId'], - $row->context['mailingActionTarget']['id'] ?? 0, - $row->context['mailingActionTarget']['hash'] ?? '', + $row->context['mailingActionTarget']['id'] ?? NULL, + $row->context['mailingActionTarget']['hash'] ?? NULL, // Note: Behavior is already undefined for SMS/'phone' mailings... - $row->context['mailingActionTarget']['email'] ?? '' + $row->context['mailingActionTarget']['email'] ?? NULL ); $row->format('text/plain')->tokens($entity, $field, -- 2.25.1