From 748a7b58b4fba43554eea6229ee4cb1bf094769f Mon Sep 17 00:00:00 2001 From: Brian Shaughnessy Date: Tue, 11 Feb 2014 13:52:52 -0500 Subject: [PATCH] CRM-14204 fix schedule reminder subject tokens --- CRM/Core/BAO/ActionSchedule.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index d70488f0a9..ac3f4501a6 100755 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -442,17 +442,17 @@ WHERE cas.entity_value = $id AND foreach ($matches[1] as $token) { list($type, $name) = preg_split('/\./', $token, 2); if ($name) { - if (!isset($subjectToken['contact'])) { - $subjectToken['contact'] = array(); + if (!isset($subjectToken[$type])) { + $subjectToken[$type] = array(); } - $subjectToken['contact'][] = $name; + $subjectToken[$type][] = $name; } } } $messageSubject = CRM_Utils_Token::replaceContactTokens($body_subject, $contact, FALSE, $subjectToken); - $messageSubject = CRM_Utils_Token::replaceDomainTokens($messageSubject, $domain, TRUE, $tokens[$value]); - $messageSubject = CRM_Utils_Token::replaceComponentTokens($messageSubject, $contact, $tokens[$value], TRUE); + $messageSubject = CRM_Utils_Token::replaceDomainTokens($messageSubject, $domain, TRUE, $subjectToken); + $messageSubject = CRM_Utils_Token::replaceComponentTokens($messageSubject, $contact, $subjectToken, TRUE); $messageSubject = CRM_Utils_Token::replaceHookTokens($messageSubject, $contact, $categories, TRUE); $messageSubject = $smarty->fetch("string:{$messageSubject}"); -- 2.25.1