From 792fce0be2bdfb26231d3c2b948c7a5edc7c6646 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Wed, 19 Jun 2019 08:33:30 +1000
Subject: [PATCH] Convert Custom Data cache group to be using standard cache
 backend

---
 CRM/Core/BAO/Cache/Psr16.php | 1 -
 CRM/Core/BAO/CustomGroup.php | 4 ++--
 CRM/Utils/System.php         | 1 +
 Civi/Core/Container.php      | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Core/BAO/Cache/Psr16.php b/CRM/Core/BAO/Cache/Psr16.php
index 34aa47cd89..384629af94 100644
--- a/CRM/Core/BAO/Cache/Psr16.php
+++ b/CRM/Core/BAO/Cache/Psr16.php
@@ -183,7 +183,6 @@ class CRM_Core_BAO_Cache_Psr16 {
     $groups = [
       // Core
       'contact fields',
-      'custom data',
 
       // Universe
 
diff --git a/CRM/Core/BAO/CustomGroup.php b/CRM/Core/BAO/CustomGroup.php
index b74b6637bd..036338d853 100644
--- a/CRM/Core/BAO/CustomGroup.php
+++ b/CRM/Core/BAO/CustomGroup.php
@@ -1818,7 +1818,7 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1,
 
     // fetch submitted custom field values later use to set as a default values
     if ($qfKey) {
-      $submittedValues = CRM_Core_BAO_Cache::getItem('custom data', $qfKey);
+      $submittedValues = Civi::cache('customData')->get($qfKey);
     }
 
     foreach ($groupTree as $key => $value) {
@@ -1877,7 +1877,7 @@ SELECT IF( EXISTS(SELECT name FROM civicrm_contact_type WHERE name like %1), 1,
       if (count($formValues)) {
         $qf = $form->get('qfKey');
         $form->assign('qfKey', $qf);
-        CRM_Core_BAO_Cache::setItem($formValues, 'custom data', $qf);
+        Civi::cache('customData')->set($qf, $formValues);
       }
 
       // hack for field type File
diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index b89d56cd0c..fcdb2a1f66 100644
--- a/CRM/Utils/System.php
+++ b/CRM/Utils/System.php
@@ -1441,6 +1441,7 @@ class CRM_Utils_System {
       Civi::cache('community_messages')->flush();
       Civi::cache('groups')->flush();
       Civi::cache('navigation')->flush();
+      Civi::cache('customData')->flush();
       CRM_Extension_System::singleton()->getCache()->flush();
       CRM_Cxn_CiviCxnHttp::singleton()->getCache()->flush();
     }
diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
index 1dc5d53b27..b205f59efe 100644
--- a/Civi/Core/Container.php
+++ b/Civi/Core/Container.php
@@ -158,6 +158,7 @@ class Container {
       'long' => 'long',
       'groups' => 'contact groups',
       'navigation' => 'navigation',
+      'customData' => 'custom data',
     ];
     foreach ($basicCaches as $cacheSvc => $cacheGrp) {
       $definitionParams = [
-- 
2.25.1