From 7e1f8a22e755b0acfbe1d0ecee82f44cbfb87c3b Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Sun, 12 Sep 2021 18:09:12 +1200 Subject: [PATCH] Fix caching on managed entities singleton --- CRM/Core/ManagedEntities.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CRM/Core/ManagedEntities.php b/CRM/Core/ManagedEntities.php index f1e0a0d247a9..19722b05b7a2 100644 --- a/CRM/Core/ManagedEntities.php +++ b/CRM/Core/ManagedEntities.php @@ -48,11 +48,10 @@ public static function getCleanupOptions() { * @return \CRM_Core_ManagedEntities */ public static function singleton($fresh = FALSE) { - static $singleton; - if ($fresh || !$singleton) { - $singleton = new CRM_Core_ManagedEntities(CRM_Core_Module::getAll()); + if ($fresh || !isset(Civi::$statics[__CLASS__ . 'singleton'])) { + Civi::$statics[__CLASS__ . 'singleton'] = new CRM_Core_ManagedEntities(CRM_Core_Module::getAll()); } - return $singleton; + return Civi::$statics[__CLASS__ . 'singleton']; } /**