projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CRM-20847 Support custom api with composite primary keys
[civicrm-core.git]
/
api
/
v3
/
utils.php
diff --git
a/api/v3/utils.php
b/api/v3/utils.php
index 7f0c00cc3b87fd05ea8452f6bc6f4835a11868f6..9f4288670b7402085ea4ece1ab20c6fbbd21ca3e 100644
(file)
--- a/
api/v3/utils.php
+++ b/
api/v3/utils.php
@@
-922,8
+922,10
@@
function _civicrm_api3_build_fields_array(&$bao, $unique = TRUE) {
if ($unique) {
if (empty($fields['id'])) {
$lowercase_entity = _civicrm_api_get_entity_name_from_camel(_civicrm_api_get_entity_name_from_dao($bao));
if ($unique) {
if (empty($fields['id'])) {
$lowercase_entity = _civicrm_api_get_entity_name_from_camel(_civicrm_api_get_entity_name_from_dao($bao));
- $fields['id'] = $fields[$lowercase_entity . '_id'];
- unset($fields[$lowercase_entity . '_id']);
+ if (isset($fields[$lowercase_entity . '_id'])) {
+ $fields['id'] = $fields[$lowercase_entity . '_id'];
+ unset($fields[$lowercase_entity . '_id']);
+ }
}
return $fields;
}
}
return $fields;
}