From 9b592ad381b7270be57b745bbda1f83512bfd6e1 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Sat, 22 Jun 2019 08:31:35 +1000
Subject: [PATCH] Ensure ACL and other caches are reset as well when flushing
 ACL Cache

---
 CRM/ACL/BAO/ACL.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php
index bc823b9703..aafc2cf2a1 100644
--- a/CRM/ACL/BAO/ACL.php
+++ b/CRM/ACL/BAO/ACL.php
@@ -687,8 +687,11 @@ SELECT $acl.*
    *   true if we found and updated the object, else false
    */
   public static function setIsActive($id, $is_active) {
-    // note this also resets any ACL cache
     Civi::cache('fields')->flush();
+    // also reset ACL Cache
+    CRM_ACL_BAO_Cache::resetCache();
+    // also reset memory cache if any
+    CRM_Utils_System::flushCache();
 
     return CRM_Core_DAO::setFieldValue('CRM_ACL_DAO_ACL', $id, 'is_active', $is_active);
   }
-- 
2.25.1