Fix caching on managed entities singleton

civicrm · Sep 12, 2021 · 7e1f8a2 · 7e1f8a2
1 parent d3a40cf
commit 7e1f8a2
Showing 1 changed file with 3 additions and 4 deletions.
diff --git 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'];
   }
 
   /**