dovecot-2.2: lib-storage: Fix to a776ee107aa2 - merged-flag wasn...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/93bff1584e5e
changeset: 19489:93bff1584e5e
user:      Timo Sirainen <tss at iki.fi>
date:      Tue Dec 08 13:13:10 2015 +0200
description:
lib-storage: Fix to a776ee107aa2 - merged-flag wasn't reset between all args.

diffstat:

 src/lib-storage/mail-search-args-simplify.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (19 lines):

diff -r a776ee107aa2 -r 93bff1584e5e src/lib-storage/mail-search-args-simplify.c
--- a/src/lib-storage/mail-search-args-simplify.c	Tue Dec 08 12:55:40 2015 +0200
+++ b/src/lib-storage/mail-search-args-simplify.c	Tue Dec 08 13:13:10 2015 +0200
@@ -523,6 +523,7 @@
 		}
 
 		/* try to merge arguments */
+		merged = FALSE;
 		switch (args->type) {
 		case SEARCH_FLAGS:
 			merged = mail_search_args_merge_flags(&ctx, args);
@@ -555,7 +556,6 @@
 			merged = mail_search_args_merge_text(&ctx, args);
 			break;
 		default:
-			merged = FALSE;
 			break;
 		}
 		if (merged) {