From 9daa7bc069541c2f51f70de6751d9d8f7b11e873 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Mon, 21 Mar 2011 18:14:25 +0000 Subject: [PATCH] Fix for extra photo key needed in two places --- .../inc/class.addressbook_export_contacts_csv.inc.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addressbook/inc/class.addressbook_export_contacts_csv.inc.php b/addressbook/inc/class.addressbook_export_contacts_csv.inc.php index 0bcb2793e1..a1da425a5e 100644 --- a/addressbook/inc/class.addressbook_export_contacts_csv.inc.php +++ b/addressbook/inc/class.addressbook_export_contacts_csv.inc.php @@ -119,6 +119,12 @@ class addressbook_export_contacts_csv implements importexport_iface_export_plugi // Check records to see if additional fields are actually used foreach ($selection as $_contact) { + if(is_array($_contact) && array_key_exists('photo', $_contact)) { + unset($_contact['photo']); + } + if(is_array($_contact) && count($_contact) == 1 && $_contact['id']) { + $_contact = $_contact['id']; + } if(is_array($_contact) && $_contact['id']) { $contact = new addressbook_egw_record(); $contact->set_record($_contact);