extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-22 07:53:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

check if customfields exists before attempting to merge

Browse Source
This commit is contained in:
Klaus Leithoff 2011-01-20 16:41:51 +00:00
parent ef09307743
commit d78217a089
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -1502,7 +1502,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;