From 0767853bee28372b079a2076f517549c8e4dcbb9 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 8 Nov 2022 19:59:32 +1300 Subject: [PATCH] Fold function only called from one place into caller, deprecate --- CRM/Contact/BAO/Contact/Utils.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CRM/Contact/BAO/Contact/Utils.php b/CRM/Contact/BAO/Contact/Utils.php index 7916e81b07..f22c0f5441 100644 --- a/CRM/Contact/BAO/Contact/Utils.php +++ b/CRM/Contact/BAO/Contact/Utils.php @@ -1009,7 +1009,8 @@ INNER JOIN civicrm_contact contact_target ON ( contact_target.id = act.contact_i } } - self::processGreetingTemplate($greetingString, [], $contactID, 'CRM_UpdateGreeting'); + CRM_Utils_Token::replaceGreetingTokens($greetingString, [], $contactID, 'CRM_UpdateGreeting', TRUE); + $greetingString = CRM_Utils_String::parseOneOffStringThroughSmarty($greetingString); $greetingString = CRM_Core_DAO::escapeString($greetingString); $cacheFieldQuery .= " WHEN {$contactID} THEN '{$greetingString}' "; @@ -1115,11 +1116,14 @@ WHERE id IN (" . implode(',', $contactIds) . ")"; * @param string $templateString * The greeting template string with contact tokens + Smarty syntax. * + * @deprecated + * * @param array $contactDetails * @param int $contactID * @param string $className */ public static function processGreetingTemplate(&$templateString, $contactDetails, $contactID, $className) { + CRM_Core_Error::deprecatedFunctionWarning('no replacement'); CRM_Utils_Token::replaceGreetingTokens($templateString, $contactDetails, $contactID, $className, TRUE); $templateString = CRM_Utils_String::parseOneOffStringThroughSmarty($templateString); } -- 2.25.1