check if customfields exists before attempting to merge

This commit is contained in:
Klaus Leithoff 2011-01-20 16:45:12 +00:00
parent 0f0e57f398
commit d46605ecf7

View File

@ -1547,7 +1547,7 @@ class addressbook_bo extends addressbook_so
continue;
}
// Add in custom fields
$contact = array_merge($contact, $custom_field_list[$contact['id']]);
if (is_array($custom_field_list[$contact['id']])) $contact = array_merge($contact, $custom_field_list[$contact['id']]);
$pos = array_search($contact['id'],$ids);
$contacts[$pos] = $contact;