mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-26 16:48:49 +01:00
* Admin: Fix group email got lost on save
This commit is contained in:
parent
39be6e0b89
commit
7677461bf6
@ -61,6 +61,10 @@ class admin_cmd_edit_group extends admin_cmd
|
|||||||
'account_status' => 'A', // not used, but so we do the same thing as the web-interface
|
'account_status' => 'A', // not used, but so we do the same thing as the web-interface
|
||||||
'account_expires' => -1,
|
'account_expires' => -1,
|
||||||
);
|
);
|
||||||
|
if(!array_key_exists('account_email', $data))
|
||||||
|
{
|
||||||
|
$data['account_email'] = null;
|
||||||
|
}
|
||||||
if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
|
if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
|
||||||
{
|
{
|
||||||
throw new Api\Exception\WrongUserinput(lang('You must enter a group name.'), 17);
|
throw new Api\Exception\WrongUserinput(lang('You must enter a group name.'), 17);
|
||||||
@ -68,7 +72,7 @@ class admin_cmd_edit_group extends admin_cmd
|
|||||||
if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'],'account_lid','g')) &&
|
if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'],'account_lid','g')) &&
|
||||||
$id !== $data['account_id'])
|
$id !== $data['account_id'])
|
||||||
{
|
{
|
||||||
throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'), 11);
|
throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'), 11);
|
||||||
}
|
}
|
||||||
if (!$data['account_members'] && !$this->account)
|
if (!$data['account_members'] && !$this->account)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user