From ca11300994f002c7e8cf1f7d72723e383092b9d2 Mon Sep 17 00:00:00 2001
From: Philip Herbert <philip@knauber.de>
Date: Sun, 20 Mar 2011 18:08:44 +0000
Subject: [PATCH] GetFolderList must always return an array to not break sync

---
 addressbook/inc/class.addressbook_activesync.inc.php | 3 ++-
 calendar/inc/class.calendar_activesync.inc.php       | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.addressbook_activesync.inc.php b/addressbook/inc/class.addressbook_activesync.inc.php
index a16c344335..865a33439a 100644
--- a/addressbook/inc/class.addressbook_activesync.inc.php
+++ b/addressbook/inc/class.addressbook_activesync.inc.php
@@ -165,6 +165,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
 	public function GetFolderList()
 	{
 		// error_log(print_r($this->addressbook->get_addressbooks(EGW_ACL_READ),true));
+		$folderlist = array();
 		foreach ($this->get_addressbooks() as $account => $label)
 		{
 			$folderlist[] = array(
@@ -327,7 +328,7 @@ class addressbook_activesync implements activesync_plugin_write, activesync_plug
 						debugLog("airsyncbasebody!");
 						$message->airsyncbasebody = new SyncAirSyncBaseBody();
 						$message->airsyncbasenativebodytype=1;
-						$this->backend->note2messagenote($contact[$attr], $bodypreference, &$message->airsyncbasebody);
+						$this->backend->note2messagenote($contact[$attr], $bodypreference, $message->airsyncbasebody);
 					}
 					break;
 
diff --git a/calendar/inc/class.calendar_activesync.inc.php b/calendar/inc/class.calendar_activesync.inc.php
index a39836a052..35132307af 100644
--- a/calendar/inc/class.calendar_activesync.inc.php
+++ b/calendar/inc/class.calendar_activesync.inc.php
@@ -75,6 +75,7 @@ class calendar_activesync implements activesync_plugin_write
 
 		$cals = $GLOBALS['egw_info']['user']['preferences']['activesync']['calendar-cals'];
 		$cals = $cals ? explode(',',$cals) : array('P');	// implicit default of 'P'
+		$folderlist = array();
 
 		foreach ($this->calendar->list_cals() as $label => $entry)
 		{
@@ -625,7 +626,7 @@ class calendar_activesync implements activesync_plugin_write
 			debugLog("airsyncbasebody!");
 			$message->airsyncbasebody = new SyncAirSyncBaseBody();
 			$message->airsyncbasenativebodytype=1;
-			$this->backend->note2messagenote($event['description'], $bodypreference, &$message->airsyncbasebody);
+			$this->backend->note2messagenote($event['description'], $bodypreference, $message->airsyncbasebody);
 		}
 
 		$message->organizername  = $GLOBALS['egw']->accounts->id2name($event['owner'],'account_fullname');