From b459070ab3be0f0687cc4632ece64c7f3cd57d4d Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 6 Oct 2008 09:24:42 +0000 Subject: [PATCH] addressbook::groupdav: fixing a bug regarding the retrieval of addressbook entrys with groupdav, (occurring when accounts stored in ldap and addresses in sql, and the entry in question is retrieved via uid (as it is possible to retrieve a contact by bassing on an array as contact_id)) --- addressbook/inc/class.addressbook_so.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_so.inc.php b/addressbook/inc/class.addressbook_so.inc.php index 806aa215d2..02440db505 100755 --- a/addressbook/inc/class.addressbook_so.inc.php +++ b/addressbook/inc/class.addressbook_so.inc.php @@ -739,7 +739,7 @@ class addressbook_so if ($this->contact_repository != $this->account_repository && is_object($this->so_accounts) && (!is_null($owner) && !$owner || !is_null($contact_id) && - ($this->contact_repository == 'sql' && !is_numeric($contact_id) || + ($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id) )|| $this->contact_repository == 'ldap' && is_numeric($contact_id)))) { return $this->so_accounts;