diff --git a/CRM/ACL/BAO/ACL.php b/CRM/ACL/BAO/ACL.php index 9c7f99f128ac..e0577e8f1d90 100644 --- a/CRM/ACL/BAO/ACL.php +++ b/CRM/ACL/BAO/ACL.php @@ -160,11 +160,10 @@ protected static function getACLs(int $contact_id) { $rule = new CRM_ACL_BAO_ACL(); - $acl = self::getTableName(); $contact = CRM_Contact_BAO_Contact::getTableName(); $query = " SELECT acl.* - FROM $acl acl + FROM civicrm_acl acl WHERE acl.entity_table = '$contact' AND acl.entity_id = $contact_id"; @@ -232,7 +231,6 @@ protected static function getGroupACLs($contact_id, $aclRoles = FALSE) { $rule = new CRM_ACL_BAO_ACL(); - $acl = self::getTableName(); $c2g = CRM_Contact_BAO_GroupContact::getTableName(); $group = CRM_Contact_BAO_Group::getTableName(); $results = []; @@ -240,7 +238,7 @@ protected static function getGroupACLs($contact_id, $aclRoles = FALSE) { if ($contact_id) { $query = " SELECT acl.* - FROM $acl acl + FROM civicrm_acl acl INNER JOIN $c2g group_contact ON acl.entity_id = group_contact.group_id WHERE acl.entity_table = '$group' @@ -277,14 +275,13 @@ protected static function getGroupACLRoles($contact_id) { $rule = new CRM_ACL_BAO_ACL(); - $acl = self::getTableName(); $aclRole = 'civicrm_acl_role'; $aclER = CRM_ACL_DAO_EntityRole::getTableName(); $c2g = CRM_Contact_BAO_GroupContact::getTableName(); $query = " SELECT acl.* - FROM $acl acl + FROM civicrm_acl acl INNER JOIN civicrm_option_group og ON og.name = 'acl_role' INNER JOIN civicrm_option_value ov @@ -321,7 +318,7 @@ protected static function getGroupACLRoles($contact_id) { $query = " SELECT acl.* - FROM $acl acl + FROM civicrm_acl acl WHERE acl.entity_id IN ( $roles ) AND acl.entity_table = 'civicrm_acl_role' ";