From: k054 <k@fsf.org>
Date: Thu, 30 Jun 2016 18:32:27 +0000 (-0500)
Subject: Merge tag '4.6.18' of https://github.com/civicrm/civicrm-core into 4.6.18-fsf
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=1fb2ed909157c601f043107f1375422b83131bd4;p=civicrm-core.git

Merge tag '4.6.18' of https://github.com/civicrm/civicrm-core into 4.6.18-fsf
---

1fb2ed909157c601f043107f1375422b83131bd4
diff --cc CRM/Contact/BAO/GroupContactCache.php
index ff98be94de,7f91329460..2c3b1eb558
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@@ -328,13 -328,6 +328,15 @@@ WHERE  id IN ( $groupIDs 
  
      $refresh = NULL;
      $smartGroupCacheTimeout = self::smartGroupCacheTimeout();
 +
 +
++
 +    $now = CRM_Utils_Date::getUTCTime();
 +    $refreshTime = CRM_Utils_Date::getUTCTime($smartGroupCacheTimeout * 60);
 +    // HACK: Hardcoded delete limit.
 +    $deleteLimit = 1000;
 +
++
      $params = array(
        1 => array(self::getCacheInvalidDateTime(), 'String'),
        2 => array(self::getRefreshDateTime(), 'String'),