flushCaches should respect permitCacheFlushMode. Also flush caches wh…

…ich have a NULL cache_date
civicrm · Sep 14, 2021 · 8d8959e · 8d8959e
1 parent 5bc6e53
commit 8d8959e
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php
@@ -248,6 +248,10 @@ protected static function clearGroupContactCache($groupID): void {
    * clear.
    */
   protected static function flushCaches() {
+    if (!CRM_Core_Config::isPermitCacheFlushMode()) {
+      return;
+    }
+
     try {
       $lock = self::getLockForRefresh();
     }
@@ -256,10 +260,12 @@ protected static function flushCaches() {
       return;
     }
     $params = [1 => [self::getCacheInvalidDateTime(), 'String']];
-    $groupsDAO = CRM_Core_DAO::executeQuery("SELECT id FROM civicrm_group WHERE cache_date <= %1", $params);
+    $groupsToFlushSQL = 'SELECT group_id FROM civicrm_group_contact_cache gc INNER JOIN civicrm_group g
+WHERE cache_date <= %1 OR cache_date IS NULL GROUP BY group_id';
+    $groupsDAO = CRM_Core_DAO::executeQuery($groupsToFlushSQL, $params);
     $expiredGroups = [];
     while ($groupsDAO->fetch()) {
-      $expiredGroups[] = $groupsDAO->id;
+      $expiredGroups[] = $groupsDAO->group_id;
     }
     if (!empty($expiredGroups)) {
       $expiredGroups = implode(',', $expiredGroups);