From b0000da15c0fa0b89dd37d6d70b5edb576ea9342 Mon Sep 17 00:00:00 2001 From: Tim Otten Date: Thu, 22 Jun 2023 16:54:06 -0700 Subject: [PATCH] MessageTemplate - Mark aliases: language<=>tokenContext.locale --- CRM/Core/BAO/MessageTemplate.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CRM/Core/BAO/MessageTemplate.php b/CRM/Core/BAO/MessageTemplate.php index 9a5cef200c..b5db3286e9 100644 --- a/CRM/Core/BAO/MessageTemplate.php +++ b/CRM/Core/BAO/MessageTemplate.php @@ -372,6 +372,8 @@ class CRM_Core_BAO_MessageTemplate extends CRM_Core_DAO_MessageTemplate implemen return !$v; }); + CRM_Utils_Array::pathSync($params, ['tokenContext', 'locale'], ['language']); + // Core#644 - handle Email ID passed as "From". if (isset($params['from'])) { $params['from'] = \CRM_Utils_Mail::formatFromAddress($params['from']); -- 2.25.1