From: Niels Heinemann Date: Wed, 26 Aug 2015 19:30:30 +0000 (-0400) Subject: CRM-17038 - Fix custom tokens in greetings X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=f551f7d327747a4ffc2e34cc7a4be9b044f7004c;p=civicrm-core.git CRM-17038 - Fix custom tokens in greetings --- diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 6b2b4da854..0ebcc5f3b2 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -1452,7 +1452,7 @@ class CRM_Utils_Token { $greetingDetails, TRUE, $greetingTokens, - FALSE, + TRUE, $escapeSmarty ); } @@ -1460,10 +1460,10 @@ class CRM_Utils_Token { // check if there are still any unevaluated tokens $remainingTokens = self::getTokens($tokenString); - // contact related $greetingTokens not empty, there are customized or hook tokens to replace - if (!empty($remainingTokens['contact'])) { + // $greetingTokens not empty, there are customized or hook tokens to replace + if (!empty($remainingTokens)) { // Fill the return properties array - $greetingTokens = $remainingTokens['contact']; + $greetingTokens = $remainingTokens; reset($greetingTokens); $greetingsReturnProperties = array(); while (list($key) = each($greetingTokens)) {