Skip to content

Commit 2c15257

Browse files
author
Till Brehm
committed
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 ispconfig/ispconfig3!1867
2 parents 690ba4c + 8255b34 commit 2c15257

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

interface/lib/plugins/mail_mail_domain_plugin.inc.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ function mail_mail_domain_edit($event_name, $page_form) {
6060
}
6161

6262
//** If the domain name or owner has been changed, change the domain and owner in all mailbox records
63-
if($page_form->oldDataRecord && ($page_form->oldDataRecord['domain'] != $domain ||
63+
if($page_form->oldDataRecord && !empty($page_form->oldDataRecord['domain']) && ($page_form->oldDataRecord['domain'] != $domain ||
6464
(isset($page_form->dataRecord['client_group_id']) && $page_form->oldDataRecord['sys_groupid'] != $page_form->dataRecord['client_group_id']))) {
6565
$app->uses('getconf');
6666
$mail_config = $app->getconf->get_server_config($page_form->dataRecord["server_id"], 'mail');

0 commit comments

Comments
 (0)