From 8d1eafc0b1dd7d96765cae236b9ebd4d78316b6a Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Sat, 2 Oct 2021 20:20:42 +1300
Subject: [PATCH] Master only regression - fix empty token date

Fixes a bug where an empty date was still getting put into a DateTime object
(defaulting to now)
---
 CRM/Core/EntityTokens.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Core/EntityTokens.php b/CRM/Core/EntityTokens.php
index e8b5362ca6..b907e992f1 100644
--- a/CRM/Core/EntityTokens.php
+++ b/CRM/Core/EntityTokens.php
@@ -91,7 +91,7 @@ class CRM_Core_EntityTokens extends AbstractTokenSubscriber {
     if ($this->isDateField($field)) {
       try {
         return $row->format('text/plain')
-          ->tokens($entity, $field, new DateTime($fieldValue));
+          ->tokens($entity, $field, ($fieldValue ? new DateTime($fieldValue) : $fieldValue));
       }
       catch (Exception $e) {
         Civi::log()->info('invalid date token');
-- 
2.25.1