jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/376461 )
Change subject: Revert "Temporarily hack out cache clearing, for test purposes
only"
......................................................................
Revert "Temporarily hack out cache clearing, for test purposes only"
This reverts commit 62a0adbda0d4d7326c58a7ee326ec7c7e11344c8.
Change-Id: I15fe190e8b78a0ea9057424f23e49a617eeda690
---
M CRM/ACL/BAO/Cache.php
M CRM/Contact/BAO/Contact.php
M CRM/Contact/BAO/GroupContactCache.php
3 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Cdentinger: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 90030e5..e1e989c 100644
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -142,7 +142,6 @@
* Deletes all the cache entries.
*/
public static function resetCache() {
- return;
// reset any static caching
self::$_cache = NULL;
diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index e9089ca..0460b22 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -980,7 +980,7 @@
* @param bool $isTrashed
*/
public static function updateContactCache($contactID, $isTrashed = FALSE) {
- return;
+
if ($isTrashed) {
CRM_Contact_BAO_GroupContactCache::removeContact($contactID);
// This has been moved to here from CRM_Contact_BAO_Contact_Permission
as that was causing
diff --git a/CRM/Contact/BAO/GroupContactCache.php
b/CRM/Contact/BAO/GroupContactCache.php
index 420ba49..e0d041a 100644
--- a/CRM/Contact/BAO/GroupContactCache.php
+++ b/CRM/Contact/BAO/GroupContactCache.php
@@ -306,7 +306,6 @@
* run the function exactly once for all groups.
*/
public static function remove($groupID = NULL, $onceOnly = TRUE) {
- return;
static $invoked = FALSE;
// typically this needs to happy only once per instance
@@ -499,7 +498,6 @@
* ideal.
*/
public static function opportunisticCacheFlush() {
- return;
if (Civi::settings()->get('smart_group_cache_refresh_mode') ==
'opportunistic') {
self::flushCaches();
}
--
To view, visit https://gerrit.wikimedia.org/r/376461
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I15fe190e8b78a0ea9057424f23e49a617eeda690
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen <emcnaugh...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ejegg <ej...@ejegg.com>
Gerrit-Reviewer: Mepps <me...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
