From c3189ce6c7301c3ec17878fd3918f31d0d3cb18a Mon Sep 17 00:00:00 2001 From: Marius Burkard <m.burkard@pixcept.de> Date: Wed, 04 May 2016 07:27:53 -0400 Subject: [PATCH] Merge branch 'stable-3.1' --- install/tpl/amavisd_user_config.master | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/install/tpl/amavisd_user_config.master b/install/tpl/amavisd_user_config.master index c729a7c..621e029 100644 --- a/install/tpl/amavisd_user_config.master +++ b/install/tpl/amavisd_user_config.master @@ -37,7 +37,7 @@ $sql_select_white_black_list = 'SELECT wb FROM spamfilter_wblist'. - ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k))' . + ' WHERE (spamfilter_wblist.rid=?) AND (spamfilter_wblist.email IN (%k)) AND (spamfilter_wblist.active="y")' . ' ORDER BY spamfilter_wblist.priority DESC'; # -- Gitblit v1.9.1