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

Fix some account changes were not saved

Browse Source
This commit is contained in:
nathangray 2020-03-20 10:31:30 -06:00
parent 6c9504e647
commit 7631eb83aa
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/Accounts.php
View File

@ -641,17 +641,20 @@ class Accounts
$old['account_lastname'] != $data['account_lastname'] ||
$old['account_email'] != $data['account_email']))
{
if (!$data['person_id']) $data['person_id'] = $old['person_id'];
if (!$data['person_id'])
{
$data['person_id'] = $old['person_id'];
}
// Include previous contact information to avoid blank history rows
$contact = (array)$GLOBALS['egw']->contacts->read($data['person_id']) + array(
$contact = array_merge((array)$GLOBALS['egw']->contacts->read($data['person_id']), array(
'n_given' => $data['account_firstname'],
'n_family' => $data['account_lastname'],
'email' => $data['account_email'],
'account_id' => $data['account_id'],
'id' => $data['person_id'],
'owner' => 0,
);
));
$GLOBALS['egw']->contacts->save($contact, true); // true = ignore addressbook acl
}
// save primary group if necessary