From d46605ecf797eb0f752d9021315548b0aebf2383 Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 20 Jan 2011 16:45:12 +0000 Subject: [PATCH] check if customfields exists before attempting to merge --- addressbook/inc/class.addressbook_bo.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php index 1b44afb045..da2474fe40 100755 --- a/addressbook/inc/class.addressbook_bo.inc.php +++ b/addressbook/inc/class.addressbook_bo.inc.php @@ -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;