From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 20 Jun 2022 00:52:12 +0000 (+1200)
Subject: Merge pull request #23837 from civicrm/5.51
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=6015df75996e789060d01c63c967e9b6105619ee;p=civicrm-core.git

Merge pull request #23837 from civicrm/5.51

5.51 to master
---

6015df75996e789060d01c63c967e9b6105619ee
diff --cc Civi/Token/TokenProcessor.php
index d2f345aece,eabab5296f..4929a9c14f
--- a/Civi/Token/TokenProcessor.php
+++ b/Civi/Token/TokenProcessor.php
@@@ -500,9 -500,12 +500,12 @@@ class TokenProcessor 
            require_once 'CRM/Core/Smarty/plugins/modifier.crmDate.php';
            return \smarty_modifier_crmDate($value->format('Y-m-d H:i:s'), $filter[1] ?? NULL);
          }
+         if ($value === '') {
+           return $value;
+         }
  
        default:
 -        throw new \CRM_Core_Exception("Invalid token filter: $filter");
 +        throw new \CRM_Core_Exception("Invalid token filter: " . json_encode($filter, JSON_UNESCAPED_SLASHES));
      }
    }