From cbcc4c6c490a203fbeabed63ca71d4d8f09cf629 Mon Sep 17 00:00:00 2001
From: Philip Herbert <philip@knauber.de>
Date: Sat, 2 Apr 2011 20:18:37 +0000
Subject: [PATCH] updated activesync engine to latest as12.1 code from Andreas
 B: - adding better support for non strict protocol implementations to improve
 device compatibility - fixing an issue of iOS Mail App crashing, due to
 server reporting changes not requested by client during message fetch. -
 adding support for multiple profiles(with different usernames) on one device
 to one server. (iOS) - Protocol Version 14.1 is now offered to the client -
 general improvements to request handling Updated egw backend and all plugins
 to be compatible with latest changes to sync engine.

ATTENTION: profiles need to be recreated on the devices.
---
 addressbook/inc/class.addressbook_activesync.inc.php | 2 +-
 calendar/inc/class.calendar_activesync.inc.php       | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_activesync.inc.php b/addressbook/inc/class.addressbook_activesync.inc.php
index e04cfd6ad4..f0b7e76be7 100644
--- a/addressbook/inc/class.addressbook_activesync.inc.php
+++ b/addressbook/inc/class.addressbook_activesync.inc.php
@@ -318,7 +318,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
 	 * @param bool $mimesupport
 	 * @return $messageobject|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
 		if (!isset($this->addressbook)) $this->addressbook = new addressbook_bo();
 
diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php
index 3c26d9828d..f459307bdf 100644
--- a/calendar/inc/class.calendar_activesync.inc.php
+++ b/calendar/inc/class.calendar_activesync.inc.php
@@ -675,10 +675,11 @@ class calendar_activesync implements activesync_plugin_write
 	 * @param string|array $id cal_id or event array (used internally)
 	 * @param int $truncsize
 	 * @param int|bool $bodypreference=false
+	 * @param $optionbodypreference=false
 	 * @param int $mimesupport=0
 	 * @return SyncAppointment|boolean false on error
 	 */
-	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $mimesupport = 0)
+	public function GetMessage($folderid, $id, $truncsize, $bodypreference=false, $optionbodypreference=false, $mimesupport = 0)
 	{
 		if (!isset($this->calendar)) $this->calendar = new calendar_boupdate();