X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=CRM%2FACL%2FAPI.php;h=ba4991dc2de8d29fb8452427f29347a00458c064;hb=bdb7b3ff54e9553345390726890914df04ea2f09;hp=95273671bfd4496cb33bd37de5d3f965c81384ee;hpb=817280e34e465b5fcf89e81710a28eae87798bc2;p=civicrm-core.git diff --git a/CRM/ACL/API.php b/CRM/ACL/API.php index 95273671bf..ba4991dc2d 100644 --- a/CRM/ACL/API.php +++ b/CRM/ACL/API.php @@ -88,11 +88,13 @@ class CRM_ACL_API { // the default value which is valid for the final AND $deleteClause = ' ( 1 ) '; if (!$skipDeleteClause) { - if (CRM_Core_Permission::check('access deleted contacts') and $onlyDeleted) { - $deleteClause = '(contact_a.is_deleted)'; + if (CRM_Core_Permission::check('access deleted contacts')) { + if ($onlyDeleted) { + $deleteClause = '(contact_a.is_deleted)'; + } } else { - // CRM-6181 + // Exclude deleted contacts due to permissions $deleteClause = '(contact_a.is_deleted = 0)'; } }