extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix not being able to change memberships (array_diff_assoc compares everything as string)

Browse Source
This commit is contained in:
Ralf Becker 2018-08-03 12:41:53 +02:00
parent c579347ad1
commit 7e4c23ca56
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
admin/inc/class.admin_account.inc.php
View File

@ -139,8 +139,16 @@ class admin_account
$content['account_firstname'] = $content['n_given']; $content['account_firstname'] = $content['n_given'];
$content['account_lastname'] = $content['n_family']; $content['account_lastname'] = $content['n_family'];
$content['account_email'] = $content['email']; $content['account_email'] = $content['email'];
if ($content['deny_edit'] || if (!empty($content['old_account']))
$content['old_account'] && !($old = array_diff_assoc($content['old_account'], $content))) {
$old = array_diff_assoc($content['old_account'], $content);
// array_diff_assoc compares everything as string (cast to string)
if ($content['old_account']['account_groups'] != $content['account_groups'])
{
$old['account_groups'] = $content['old_account']['account_groups'];
}
}
if ($content['deny_edit'] || empty($old))
{ {
return ''; // no need to save account data, if nothing changed return ''; // no need to save account data, if nothing changed
} }