mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-13 17:38:28 +01:00
fix for bug #8178(Stylite) default Addressbook preference is not used, when addressbook-value is not to be copied
This commit is contained in:
parent
bbaaa9a8b4
commit
9216fea675
@ -975,6 +975,7 @@ class addressbook_ui extends addressbook_bo
|
|||||||
$wildcard = $query['advanced_search']['meth_select'];
|
$wildcard = $query['advanced_search']['meth_select'];
|
||||||
unset($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,
|
$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']);
|
$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']))
|
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['creator'] = $this->user;
|
||||||
$content['created'] = $this->now_su;
|
$content['created'] = $this->now_su;
|
||||||
|
Loading…
Reference in New Issue
Block a user