Changed ClassName for ACL clacc

diff --git a/CRM/ACL/BAO/Cache.php b/CRM/ACL/BAO/Cache.php
index 921adfeaf6c08c03e4c94238af36bde567b793a9..c165e940c0d69357574b7063acddbe378f07182a 100644 (file)
--- a/CRM/ACL/BAO/Cache.php
+++ b/CRM/ACL/BAO/Cache.php
@@ -34,7 +34,7 @@
 /**
  *  Access Control Cache.
  */
-class CRM_ACL_BAO_Cache extends CRM_ACL_DAO_Cache {
+class CRM_ACL_BAO_Cache extends CRM_ACL_DAO_ACLCache {
 
   public static $_cache = NULL;
 
@@ -96,7 +96,7 @@ SELECT acl_id
    */
   public static function store($id, &$cache) {
     foreach ($cache as $aclID => $data) {
-      $dao = new CRM_ACL_DAO_Cache();
+      $dao = new CRM_ACL_BAO_Cache();
       if ($id) {
         $dao->contact_id = $id;
       }

diff --git a/CRM/ACL/DAO/Cache.php b/CRM/ACL/DAO/ACLCache.php
similarity index 91%
rename from CRM/ACL/DAO/Cache.php
rename to CRM/ACL/DAO/ACLCache.php
index 34a3e7360b56f9727e26ea3315146edf437e8daf..cbf774e4b27641421418c2d22ded5507ad8ec856 100644 (file)
--- a/CRM/ACL/DAO/Cache.php
+++ b/CRM/ACL/DAO/ACLCache.php
@@ -4,15 +4,15 @@
  * @package CRM
  * @copyright CiviCRM LLC (c) 2004-2019
  *
- * Generated from xml/schema/CRM/ACL/Cache.xml
+ * Generated from xml/schema/CRM/ACL/ACLCache.xml
  * DO NOT EDIT.  Generated by CRM_Core_CodeGen
- * (GenCodeChecksum:6180a43e0d4bd8f2008286be6683d0ba)
+ * (GenCodeChecksum:a7bccfc35714fdcf0fdb6f4cd24842bd)
  */
 
 /**
- * Database access object for the Cache entity.
+ * Database access object for the ACLCache entity.
  */
-class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
+class CRM_ACL_DAO_ACLCache extends CRM_Core_DAO {
 
   /**
    * Static instance to hold the table name.
@@ -96,8 +96,8 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
           'required' => TRUE,
           'where' => 'civicrm_acl_cache.id',
           'table_name' => 'civicrm_acl_cache',
-          'entity' => 'Cache',
-          'bao' => 'CRM_ACL_BAO_Cache',
+          'entity' => 'ACLCache',
+          'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
         ],
         'contact_id' => [
@@ -107,8 +107,8 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
           'description' => ts('Foreign Key to Contact'),
           'where' => 'civicrm_acl_cache.contact_id',
           'table_name' => 'civicrm_acl_cache',
-          'entity' => 'Cache',
-          'bao' => 'CRM_ACL_BAO_Cache',
+          'entity' => 'ACLCache',
+          'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
           'FKClassName' => 'CRM_Contact_DAO_Contact',
         ],
@@ -120,8 +120,8 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
           'required' => TRUE,
           'where' => 'civicrm_acl_cache.acl_id',
           'table_name' => 'civicrm_acl_cache',
-          'entity' => 'Cache',
-          'bao' => 'CRM_ACL_BAO_Cache',
+          'entity' => 'ACLCache',
+          'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
           'FKClassName' => 'CRM_ACL_DAO_ACL',
         ],
@@ -133,8 +133,8 @@ class CRM_ACL_DAO_Cache extends CRM_Core_DAO {
           'required' => FALSE,
           'where' => 'civicrm_acl_cache.modified_date',
           'table_name' => 'civicrm_acl_cache',
-          'entity' => 'Cache',
-          'bao' => 'CRM_ACL_BAO_Cache',
+          'entity' => 'ACLCache',
+          'bao' => 'CRM_ACL_DAO_ACLCache',
           'localizable' => 0,
         ],
       ];

diff --git a/CRM/Core/DAO/AllCoreTables.data.php b/CRM/Core/DAO/AllCoreTables.data.php
index e42e08bf4eb9acc892c852ca700be1d69eae6ccc..8a366e7b077a3e59d654fcc72154048296459205 100644 (file)
--- a/CRM/Core/DAO/AllCoreTables.data.php
+++ b/CRM/Core/DAO/AllCoreTables.data.php
@@ -397,9 +397,9 @@ return [
     'class' => 'CRM_Core_DAO_StatusPreference',
     'table' => 'civicrm_status_pref',
   ],
-  'CRM_ACL_DAO_Cache' => [
-    'name' => 'Cache',
-    'class' => 'CRM_ACL_DAO_Cache',
+  'CRM_ACL_DAO_ACLCache' => [
+    'name' => 'ACLCache',
+    'class' => 'CRM_ACL_DAO_ACLCache',
     'table' => 'civicrm_acl_cache',
   ],
   'CRM_Contact_DAO_Group' => [

diff --git a/xml/schema/ACL/Cache.xml b/xml/schema/ACL/Cache.xml
index d73ea8a08a583363516aae81d92e4d05af3c7595..38c9df70bb819a94e7efe151c0ee1da9912ed3f8 100644 (file)
--- a/xml/schema/ACL/Cache.xml
+++ b/xml/schema/ACL/Cache.xml
@@ -2,7 +2,7 @@
 
 <table>
   <base>CRM/ACL</base>
-  <class>Cache</class>
+  <class>ACLCache</class>
   <name>civicrm_acl_cache</name>
   <comment>Cache for acls and contacts</comment>
   <add>1.6</add>