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 #19505 from mattwire/remotememrelated
[civicrm-core.git]
/
api
/
v3
/
Contact.php
diff --git
a/api/v3/Contact.php
b/api/v3/Contact.php
index d30d0d0b0995fc8f0142050810e47202323e66c1..8217b646d1a2630fae44249574ee63ce9ff65b2c 100644
(file)
--- a/
api/v3/Contact.php
+++ b/
api/v3/Contact.php
@@
-818,7
+818,7
@@
function civicrm_api3_contact_getquick($params) {
}
$select = $actualSelectElements = ['sort_name'];
}
$select = $actualSelectElements = ['sort_name'];
- $where = '';
+
foreach ($list as $value) {
$suffix = substr($value, 0, 2) . substr($value, -1);
switch ($value) {
foreach ($list as $value) {
$suffix = substr($value, 0, 2) . substr($value, -1);
switch ($value) {
@@
-875,14
+875,14
@@
function civicrm_api3_contact_getquick($params) {
// add acl clause here
list($aclFrom, $aclWhere) = CRM_Contact_BAO_Contact_Permission::cacheClause('cc');
// add acl clause here
list($aclFrom, $aclWhere) = CRM_Contact_BAO_Contact_Permission::cacheClause('cc');
-
+ $whereClauses = ['cc.is_deleted = 0'];
if ($aclWhere) {
if ($aclWhere) {
- $where
.= " AND $aclWhere "
;
+ $where
Clauses[] = $aclWhere
;
}
$isPrependWildcard = \Civi::settings()->get('includeWildCardInName');
if (!empty($params['org'])) {
}
$isPrependWildcard = \Civi::settings()->get('includeWildCardInName');
if (!empty($params['org'])) {
- $where
.= " AND contact_type = \"Organization\""
;
+ $where
Clauses[] = 'contact_type = "Organization"'
;
// CRM-7157, hack: get current employer details when
// employee_id is present.
// CRM-7157, hack: get current employer details when
// employee_id is present.
@@
-914,21
+914,21
@@
function civicrm_api3_contact_getquick($params) {
if (!empty($params['contact_sub_type'])) {
$contactSubType = CRM_Utils_Type::escape($params['contact_sub_type'], 'String');
if (!empty($params['contact_sub_type'])) {
$contactSubType = CRM_Utils_Type::escape($params['contact_sub_type'], 'String');
- $where
.= " AND
cc.contact_sub_type = '{$contactSubType}'";
+ $where
Clauses[] = "
cc.contact_sub_type = '{$contactSubType}'";
}
if (!empty($params['contact_type'])) {
$contactType = CRM_Utils_Type::escape($params['contact_type'], 'String');
}
if (!empty($params['contact_type'])) {
$contactType = CRM_Utils_Type::escape($params['contact_type'], 'String');
- $where
.= " AND
cc.contact_type LIKE '{$contactType}'";
+ $where
Clauses[] = "
cc.contact_type LIKE '{$contactType}'";
}
// Set default for current_employer or return contact with particular id
if (!empty($params['id'])) {
}
// Set default for current_employer or return contact with particular id
if (!empty($params['id'])) {
- $where
.= " AND cc.id = "
. (int) $params['id'];
+ $where
Clauses[] = 'cc.id = '
. (int) $params['id'];
}
if (!empty($params['cid'])) {
}
if (!empty($params['cid'])) {
- $where
.= " AND cc.id <> "
. (int) $params['cid'];
+ $where
Clauses[] = 'cc.id <> '
. (int) $params['cid'];
}
// Contact's based of relationhip type
}
// Contact's based of relationhip type
@@
-949,10
+949,10
@@
function civicrm_api3_contact_getquick($params) {
if ($config->includeNickNameInName) {
$includeNickName = " OR nick_name LIKE '$strSearch'";
}
if ($config->includeNickNameInName) {
$includeNickName = " OR nick_name LIKE '$strSearch'";
}
-
+ $where = ' AND ' . implode(' AND ', $whereClauses);
if (isset($customOptionsWhere)) {
$customOptionsWhere = $customOptionsWhere ?: [0];
if (isset($customOptionsWhere)) {
$customOptionsWhere = $customOptionsWhere ?: [0];
- $whereClause =
" WHERE ("
. implode(' OR ', $customOptionsWhere) . ") $where";
+ $whereClause =
' WHERE ('
. implode(' OR ', $customOptionsWhere) . ") $where";
}
elseif (!empty($params['field_name']) && !empty($params['table_name']) && $params['field_name'] != 'sort_name') {
$whereClause = " WHERE ( $table_name.$field_name LIKE '$strSearch') {$where}";
}
elseif (!empty($params['field_name']) && !empty($params['table_name']) && $params['field_name'] != 'sort_name') {
$whereClause = " WHERE ( $table_name.$field_name LIKE '$strSearch') {$where}";