From eb2ec31a4e82103e416b964be563230b5812ef4b Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Fri, 24 Jul 2015 12:08:21 +0000 Subject: [PATCH] do not use SYNC_GAL_ALIAS within the result-set when not requested; as we do not request it. omit it completely --- addressbook/inc/class.addressbook_zpush.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addressbook/inc/class.addressbook_zpush.inc.php b/addressbook/inc/class.addressbook_zpush.inc.php index 709246c945..fe19604503 100644 --- a/addressbook/inc/class.addressbook_zpush.inc.php +++ b/addressbook/inc/class.addressbook_zpush.inc.php @@ -803,8 +803,8 @@ class addressbook_zpush implements activesync_plugin_write, activesync_plugin_se { foreach($contacts as $contact) { - $item[SYNC_GAL_ALIAS] = $contact['contact_id']; - $item[SYNC_GAL_LASTNAME] = $contact['n_family']; + //$item[SYNC_GAL_ALIAS] = $contact['contact_id']; + $item[SYNC_GAL_LASTNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name']; $item[SYNC_GAL_FIRSTNAME] = $contact['n_given']; $item[SYNC_GAL_DISPLAYNAME] = $contact['n_fn']; if (!trim($item[SYNC_GAL_DISPLAYNAME])) $item[SYNC_GAL_DISPLAYNAME] = $contact['n_family']?$contact['n_family']:$contact['org_name'];