extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-22 05:49:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

backport of rev27514+rev27703 from trunk to fix "n_fn not updated anymore"-issue

Browse Source
This commit is contained in:
Klaus Leithoff 2010-02-26 11:47:17 +00:00
parent ee00114a2e
commit 96a47f2dff
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -726,11 +726,11 @@ class addressbook_bo extends addressbook_so
$contact['modifier'] = $this->user;
$contact['modified'] = $this->now_su;
// set full name and fileas from the content
if (!isset($contact['n_fn']))
{
$contact['n_fn'] = $this->fullname($contact);
if (strlen($fullname = $this->fullname($contact)) > 0 && (!isset($contact['n_fn']) || $contact['n_fn'] != $fullname)) {
$contact['n_fn'] = $fullname;
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))