revert change of rev29328, as n_fn issue if fixed in UI now

This commit is contained in:
Klaus Leithoff 2010-03-08 08:46:01 +00:00
parent 8e3009acfe
commit 7c1d9fc056

View File

@ -726,11 +726,10 @@ class addressbook_bo extends addressbook_so
$contact['modifier'] = $this->user;
$contact['modified'] = $this->now_su;
// set full name and fileas from the content
if (strlen($fullname = $this->fullname($contact)) > 0 && (!isset($contact['n_fn']) || $contact['n_fn'] != $fullname)) {
$contact['n_fn'] = $fullname;
if (!isset($contact['n_fn']) ) {
$contact['n_fn'] = $this->fullname($contact);
if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
}
unset($fullname);
$to_write = $contact;
// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
if (!$ignore_acl && !$contact['owner'] && !$this->is_admin($contact))