From 17cca51ef8200473ed3867e0bd5bf3ac787673d6 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 28 Jul 2021 10:57:30 +1200 Subject: [PATCH] Caching fixes --- CRM/Utils/Token.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/CRM/Utils/Token.php b/CRM/Utils/Token.php index 8d065c4021..6e9ea5b403 100644 --- a/CRM/Utils/Token.php +++ b/CRM/Utils/Token.php @@ -1559,7 +1559,7 @@ class CRM_Utils_Token { protected static function _buildContributionTokens() { $key = 'contribution'; - if (self::$_tokens[$key] == NULL) { + if (!isset(Civi::$statics[__CLASS__][__FUNCTION__][$key])) { $processor = new CRM_Contribute_Tokens(); $tokens = array_merge(CRM_Contribute_BAO_Contribution::exportableFields('All'), ['campaign' => [], 'financial_type' => [], 'payment_instrument' => []], @@ -1571,8 +1571,9 @@ class CRM_Utils_Token { $tokens[$token['name']] = []; } } - self::$_tokens[$key] = array_keys($tokens); + Civi::$statics[__CLASS__][__FUNCTION__][$key] = array_keys($tokens); } + self::$_tokens[$key] = Civi::$statics[__CLASS__][__FUNCTION__][$key]; } /** -- 2.25.1