From bf83f9597ceca308c173614fa2ac80fc1a031caf Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Thu, 2 Sep 2010 11:26:49 +0000 Subject: [PATCH] fix for bug #8178(Stylite) default Addressbook preference is not used, when addressbook-value is not to be copied --- addressbook/inc/class.addressbook_ui.inc.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php index 5b69b06d65..b65c0854de 100644 --- a/addressbook/inc/class.addressbook_ui.inc.php +++ b/addressbook/inc/class.addressbook_ui.inc.php @@ -975,6 +975,7 @@ class addressbook_ui extends addressbook_bo $wildcard = $query['advanced_search']['meth_select']; unset($query['advanced_search']['meth_select']); } + //if ($do_email ) $email_only = array('id','owner','tid','n_fn','n_family','n_given','org_name','email','email_home'); $rows = parent::search($query['advanced_search'] ? $query['advanced_search'] : $query['search'],$id_only, $order,'',$wildcard,false,$op,array((int)$query['start'],(int) $query['num_rows']),$query['col_filter']); @@ -1412,7 +1413,7 @@ class addressbook_ui extends addressbook_bo } if(!isset($content['owner'])) { - $this->default_private ? $this->user.'p' : $this->default_addressbook; + $content['owner'] = $this->default_private ? $this->user.'p' : $this->default_addressbook; } $content['creator'] = $this->user; $content['created'] = $this->now_su;