"fixed backend detection to recognice $contact_id = array('account_id' => 123) as account"

This commit is contained in:
Ralf Becker 2009-10-26 11:47:23 +00:00
parent 8d2194f191
commit 78143cb9c6

View File

@ -750,12 +750,12 @@ class addressbook_so
* @param int $owner=null account_id of owner or 0 for accounts * @param int $owner=null account_id of owner or 0 for accounts
* @return object * @return object
*/ */
function &get_backend($contact_id=null,$owner=null) function get_backend($contact_id=null,$owner=null)
{ {
if ($owner === '') $owner = null; if ($owner === '') $owner = null;
if ($this->contact_repository != $this->account_repository && is_object($this->so_accounts) && if ($this->contact_repository != $this->account_repository && is_object($this->so_accounts) &&
(!is_null($owner) && !$owner || !is_null($contact_id) && (!is_null($owner) && !$owner || is_array($contact_id) && $contact_id['account_id'] || !is_null($contact_id) &&
($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id) )|| ($this->contact_repository == 'sql' && (!is_numeric($contact_id) && !is_array($contact_id) )||
$this->contact_repository == 'ldap' && is_numeric($contact_id)))) $this->contact_repository == 'ldap' && is_numeric($contact_id))))
{ {