From: Coleman Watts <coleman@civicrm.org>
Date: Tue, 26 May 2020 13:26:26 +0000 (-0400)
Subject: APIv4 - skip acl clause for 1-1 custom fields
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=e3d9e6acceb3602c95357933063592fe56abe701;p=civicrm-core.git

APIv4 - skip acl clause for 1-1 custom fields
---

diff --git a/Civi/Api4/Service/Schema/Joiner.php b/Civi/Api4/Service/Schema/Joiner.php
index 6b66c57f98..4bd59de171 100644
--- a/Civi/Api4/Service/Schema/Joiner.php
+++ b/Civi/Api4/Service/Schema/Joiner.php
@@ -61,10 +61,11 @@ class Joiner {
       $target = $link->getTargetTable();
       $alias = $link->getAlias();
       $bao = \CRM_Core_DAO_AllCoreTables::getBAOClassName(\CRM_Core_DAO_AllCoreTables::getClassForTable($target));
-      $conditions = array_merge(
-        $link->getConditionsForJoin($baseTable),
-        $query->getAclClause($alias, $bao, explode('.', $joinPath))
-      );
+      $conditions = $link->getConditionsForJoin($baseTable);
+      // Custom fields do not have a bao, and currently do not have field-specific ACLs
+      if ($bao) {
+        $conditions = array_merge($conditions, $query->getAclClause($alias, $bao, explode('.', $joinPath)));
+      }
 
       $query->join($side, $target, $alias, $conditions);