projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #17244 from totten/master-preboot
[civicrm-core.git]
/
CRM
/
ACL
/
API.php
diff --git
a/CRM/ACL/API.php
b/CRM/ACL/API.php
index 95273671bfd4496cb33bd37de5d3f965c81384ee..ba4991dc2de8d29fb8452427f29347a00458c064 100644
(file)
--- 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) {
// 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 {
}
else {
- //
CRM-6181
+ //
Exclude deleted contacts due to permissions
$deleteClause = '(contact_a.is_deleted = 0)';
}
}
$deleteClause = '(contact_a.is_deleted = 0)';
}
}