Merge branch 'spamfilter-delete-fix' into 'stable-3.1'

Till Brehm · Till Brehm · commit a62af307fd9b · 2016-07-11T12:52:39.000+02:00
Fixed deleting spamfilter users when deleting mail domain

Signed-off-by: Kristián Feldsam &lt;feldsam@gmail.com&gt;

See merge request !377
diff --git a/interface/web/mail/mail_domain_del.php b/interface/web/mail/mail_domain_del.php
@@ -78,7 +78,7 @@ function onBeforeDelete() {
 		}
 
 		// Delete all spamfilters that belong to this domain
-		$records = $app->db->queryAllRecords("SELECT id FROM spamfilter_users WHERE email = ?", '%@' . $domain);
+		$records = $app->db->queryAllRecords("SELECT id FROM spamfilter_users WHERE email like ?", '%@' . $domain);
 		foreach($records as $rec) {
 			$app->db->datalogDelete('spamfilter_users', 'id', $rec['id']);
 		}

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ function onBeforeDelete() {`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// Delete all spamfilters that belong to this domain`
`81`		`- $records = $app->db->queryAllRecords("SELECT id FROM spamfilter_users WHERE email = ?", '%@' . $domain);`
	`81`	`+ $records = $app->db->queryAllRecords("SELECT id FROM spamfilter_users WHERE email like ?", '%@' . $domain);`
`82`	`82`	`foreach($records as $rec) {`
`83`	`83`	`$app->db->datalogDelete('spamfilter_users', 'id', $rec['id']);`
`84`	`84`	`}`