X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FUtils%2FToken.php;h=9afa2e486fdfe24c9a6291dd275baf07a885a7da;hb=baff51f9d2525bba35f889183127225e7ac60cc0;hp=d9014d7760ae41dbade150bf5ea5765e11222ba5;hpb=594eddc519b33992b5f046fa91627c87966e2527;p=civicrm-core.git

diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php
index d9014d7760..9afa2e486f 100644
--- a/CRM/Utils/Token.php
+++ b/CRM/Utils/Token.php
@@ -1434,6 +1434,12 @@ class CRM_Utils_Token {
    * @param array $greetingTokens
    */
   private static function removeNullContactTokens(&$tokenString, $contactDetails, &$greetingTokens) {
+
+    // Only applies to contact tokens
+    if (!array_key_exists('contact', $greetingTokens)) {
+      return;
+    }
+
     $greetingTokensOriginal = $greetingTokens;
     $contactFieldList = CRM_Contact_DAO_Contact::fields();
     // Sometimes contactDetails are in a multidemensional array, sometimes a