Merge branch 'master' into 'stable-3.1'

fix sql query typo, closes #3762



See merge request !284

server/plugins-available/postfix_filter_plugin.inc.php

@@ -80,7 +80,7 @@ class postfix_filter_plugin {
 
 		$type = $data["new"]["type"];
 		if($type != '') {
-			$sql = "SELECT * FROM mail_content_filter WHERE server_id = ? AND type = ?' AND active = 'y'";
+			$sql = "SELECT * FROM mail_content_filter WHERE server_id = ? AND type = ? AND active = 'y'";
 			$rules = $app->db->queryAllRecords($sql, $conf["server_id"], $type);
 			$content = '';
 			foreach($rules as $rule) {