CRM-18692 issue warning about empty smart group cache rather than crash the server

diff --git a/CRM/Contact/BAO/GroupContactCache.php b/CRM/Contact/BAO/GroupContactCache.php
index 817f4ede4083679cd3e14b1cff4a5bffba520db2..4a6021753ee254066ca8c30ddafc0af854008b21 100644 (file)
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -196,17 +196,6 @@ AND    g.refresh_date IS NULL
     }
   }
 
-  /**
-   * Fill the group contact cache if it is empty.
-   *
-   * Do this by the expensive operation of loading all groups. Call sparingly.
-   */
-  public static function fillIfEmpty() {
-    if (!CRM_Core_DAO::singleValueQuery("SELECT COUNT(id) FROM civicrm_group_contact_cache")) {
-      self::loadAll();
-    }
-  }
-
   /**
    * Build the smart group cache for a given group.
    *

diff --git a/CRM/Group/Page/Group.php b/CRM/Group/Page/Group.php
index 987609b44a85a06eab91d2d5bd9b34e90e322e91..d0f6efddf37a7db3133b8e0d1c180f5bb8d51ef8 100644 (file)
--- a/CRM/Group/Page/Group.php
+++ b/CRM/Group/Page/Group.php
@@ -143,8 +143,8 @@ class CRM_Group_Page_Group extends CRM_Core_Page_Basic {
     if (!empty($_GET['update_smart_groups'])) {
       CRM_Contact_BAO_GroupContactCache::loadAll();
     }
-    else {
-      CRM_Contact_BAO_GroupContactCache::fillIfEmpty();
+    elseif (!CRM_Core_DAO::singleValueQuery("SELECT id FROM civicrm_group_contact_cache LIMIT 1")) {
+      CRM_Core_Session::setStatus(ts('Count data for smart groups is not currently calculated. You may click Update Smart Groups to generate it. Be aware this can cause significant server load'));
     }
 
     $this->search();