Mercurial > dovecot > core-2.2

changeset 18594:b0ac652f9e2f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fts: Prefer language-specific filter settings over global fts_filters setting.
author Timo Sirainen <tss@iki.fi>
date Sat, 09 May 2015 15:10:17 +0300
parents 7bd196b84518
children 461bb302bd03
files src/plugins/fts/fts-user.c
diffstat 1 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;