dovecot-2.2: fts: Prefer language-specific filter settings over ...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/b0ac652f9e2f
changeset: 18594:b0ac652f9e2f
user:      Timo Sirainen <tss at iki.fi>
date:      Sat May 09 15:10:17 2015 +0300
description:
fts: Prefer language-specific filter settings over global fts_filters setting.

diffstat:

 src/plugins/fts/fts-user.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 7bd196b84518 -r b0ac652f9e2f src/plugins/fts/fts-user.c
--- a/src/plugins/fts/fts-user.c	Sat May 09 15:07:13 2015 +0300
+++ b/src/plugins/fts/fts-user.c	Sat May 09 15:10:17 2015 +0300
@@ -64,10 +64,12 @@
 	unsigned int i;
 	int ret = 0;
 
-	filters_key = "fts_filters";
+	/* try to get the language-specific filters first */
+	filters_key = t_strconcat("fts_filters_", lang->name, NULL);
 	str = mail_user_plugin_getenv(user, filters_key);
 	if (str == NULL) {
-		filters_key = t_strconcat("fts_filters_", lang->name, NULL);
+		/* fallback to global filters */
+		filters_key = "fts_filters";
 		str = mail_user_plugin_getenv(user, filters_key);
 		if (str == NULL) {
 			*filter_r = NULL;