Skip to content
Snippets Groups Projects
Commit 2c15257c authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch...

Merge branch '6669-mail_domain_add-with-api-fires-mail_mail_domain_edit-with-event-where-a-new-domain-case-check' into 'develop'

Resolve "mail_domain_add() with api - fires mail_mail_domain_edit with event where a "new domain" case check is missing on user/spamlist update"

Closes #6669

See merge request !1867
parents 690ba4cc 8255b340
No related branches found
No related tags found
1 merge request!1867Resolve "mail_domain_add() with api - fires mail_mail_domain_edit with event where a "new domain" case check is missing on user/spamlist update"
Pipeline #14499 passed
...@@ -60,7 +60,7 @@ class mail_mail_domain_plugin { ...@@ -60,7 +60,7 @@ class mail_mail_domain_plugin {
} }
//** If the domain name or owner has been changed, change the domain and owner in all mailbox records //** If the domain name or owner has been changed, change the domain and owner in all mailbox records
if($page_form->oldDataRecord && ($page_form->oldDataRecord['domain'] != $domain || if($page_form->oldDataRecord && !empty($page_form->oldDataRecord['domain']) && ($page_form->oldDataRecord['domain'] != $domain ||
(isset($page_form->dataRecord['client_group_id']) && $page_form->oldDataRecord['sys_groupid'] != $page_form->dataRecord['client_group_id']))) { (isset($page_form->dataRecord['client_group_id']) && $page_form->oldDataRecord['sys_groupid'] != $page_form->dataRecord['client_group_id']))) {
$app->uses('getconf'); $app->uses('getconf');
$mail_config = $app->getconf->get_server_config($page_form->dataRecord["server_id"], 'mail'); $mail_config = $app->getconf->get_server_config($page_form->dataRecord["server_id"], 'mail');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment