Skip to content
Snippets Groups Projects
Commit c69903f4 authored by Marius Burkard's avatar Marius Burkard
Browse files

Merge branch '6286-deactivate-e-mail-doman-policy-dont-work' into 'develop'

Resolve "Deactivate e-mail doman policy dont work"

Closes #6286

See merge request ispconfig/ispconfig3!1561
parents 3e536aa2 d716ba29
No related branches found
No related tags found
1 merge request!1561Resolve "Deactivate e-mail doman policy dont work"
Pipeline #10587 passed
......@@ -440,7 +440,7 @@ class page_action extends tform_actions {
}
}
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = ?", '@' . $domain);
$tmp_user = $app->db->queryOneRecord("SELECT id, policy_id FROM spamfilter_users WHERE email = ?", '@' . $domain);
if($tmp_user["id"] > 0) {
// There is already a record that we will update
if((! $skip_spamfilter_users_update) && ($policy_id != $tmp_user['policy_id'])) {
......
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