From 2aa6450867ba181eff5e1c5082c4adf122383f48 Mon Sep 17 00:00:00 2001 From: Jon Goldberg Date: Thu, 8 Oct 2020 17:20:32 -0400 Subject: [PATCH] Financial#111: Contribution tokens always display amount with default currency --- CRM/Utils/Token.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 850a2516ac..de73b20253 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -1802,7 +1802,10 @@ class CRM_Utils_Token { case 'net_amount': case 'fee_amount': case 'non_deductible_amount': - $value = CRM_Utils_Money::format(CRM_Utils_Array::retrieveValueRecursive($contribution, $token)); + // FIXME: Is this ever a multi-dimensional array? Why use retrieveValueRecursive()? + $amount = CRM_Utils_Array::retrieveValueRecursive($contribution, $token); + $currency = CRM_Utils_Array::retrieveValueRecursive($contribution, 'currency'); + $value = CRM_Utils_Money::format($amount, $currency); break; case 'receive_date': -- 2.25.1