From 1a51ac86f7f987eb44caf62d04bc962c25be5d5e Mon Sep 17 00:00:00 2001 From: Philip Herbert Date: Tue, 14 Jun 2011 15:33:11 +0000 Subject: [PATCH] merged latest changes from Andreas B. with the following changes: - adapted searchquery so that parameters are equal for gal, mailbox and documentlibrary searches - Fix SAMSUNG Android 2.3.3 client compose_Saveinsentitems breaking - Corrected searchquery for GAL so that it includes the search range for backends that filter range already during query - Take correct exporter to find changecount for optionfolder - Fix for handling Sync requests where same item gets read and removed. --- addressbook/inc/class.addressbook_activesync.inc.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_activesync.inc.php b/addressbook/inc/class.addressbook_activesync.inc.php index 7525c55f38..5e89563143 100644 --- a/addressbook/inc/class.addressbook_activesync.inc.php +++ b/addressbook/inc/class.addressbook_activesync.inc.php @@ -82,7 +82,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug //'radiophonenumber' => '', //'spouse' => '', 'suffix' => 'n_suffix', - 'title' => 'title', // @TODO: check if n_prefix + 'title' => 'n_prefix', 'webpage' => 'url', //'yomicompanyname' => '', //'yomifirstname' => '', @@ -128,7 +128,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug if ($return_all_in_one && $GLOBALS['egw_info']['user']['preferences']['activesync']['addressbook-all-in-one']) { $abs = array( - $GLOBALS['egw_info']['user']['account_id'] => lang('All'), + $GLOBALS['egw_info']['user']['account_id'] => lang('personal'), ); } else @@ -695,7 +695,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo(); $items = array(); - if (($contacts =& $this->addressbook->search($searchquery, false, false, '', '%', false, 'OR'))) + if (($contacts =& $this->addressbook->search($searchquery['query'], false, false, '', '%', false, 'OR'))) { foreach($contacts as $contact) {