From e687b23c1f6d35da121bbdff7f501cdec229aaca Mon Sep 17 00:00:00 2001
From: Ralf Becker <ralfbecker@outdoor-training.de>
Date: Sun, 21 Mar 2010 09:56:11 +0000
Subject: [PATCH] "patch from Lorentz <lorentz(at)friendship-systems.com>"

---
 addressbook/inc/class.boaddressbook.inc.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/addressbook/inc/class.boaddressbook.inc.php b/addressbook/inc/class.boaddressbook.inc.php
index 744f819d4e..d87ea53bcb 100644
--- a/addressbook/inc/class.boaddressbook.inc.php
+++ b/addressbook/inc/class.boaddressbook.inc.php
@@ -363,7 +363,7 @@ class boaddressbook
 				'contact_owner' => 0,
 			));
 		}
-		return $this->data2xmlrpc(array_merge($this->contacts->old_read(
+		$searchResults = $this->contacts->old_read(
 			(int) $param['start'],
 			(int) $param['limit'],
 			$param['fields'],
@@ -373,7 +373,10 @@ class boaddressbook
 			$param['order'],
 			$param['lastmod'] ? $param['lastmod'] : -1,
 			$param['cquery']
-		),$extra_accounts),$read_customfields);
+		);
+		if (!is_array($searchResults)) $searchResults = array();
+
+		return $this->data2xmlrpc(array_merge($searchResults,$extra_accounts),$read_customfields);
 	}
 
 	/**