From 7c1d9fc056582b448d19c4b713243e7b2424febd Mon Sep 17 00:00:00 2001 From: Klaus Leithoff Date: Mon, 8 Mar 2010 08:46:01 +0000 Subject: [PATCH] revert change of rev29328, as n_fn issue if fixed in UI now --- addressbook/inc/class.addressbook_bo.inc.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_bo.inc.php b/addressbook/inc/class.addressbook_bo.inc.php index 8be4234fa2..2f72d55f02 100755 --- a/addressbook/inc/class.addressbook_bo.inc.php +++ b/addressbook/inc/class.addressbook_bo.inc.php @@ -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))