From ea2dbaa29028719a3f9599502ffe732cf73dc544 Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Tue, 6 Feb 2018 15:10:48 +0200 Subject: [PATCH] lib-storage: Set mailbox_transaction_context.flags earlier Set it in index_transaction_init() so plugins' transaction_begin() methods see it after calling super.transaction_begin(). --- src/lib-storage/index/index-transaction.c | 1 + src/lib-storage/mail-storage.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib-storage/index/index-transaction.c b/src/lib-storage/index/index-transaction.c index 45085ec177..cb0e5637c8 100644 --- a/src/lib-storage/index/index-transaction.c +++ b/src/lib-storage/index/index-transaction.c @@ -162,6 +162,7 @@ void index_transaction_init(struct mailbox_transaction_context *t, if ((flags & MAILBOX_TRANSACTION_FLAG_REFRESH) != 0) mail_index_refresh(box->index); + t->flags = flags; t->box = box; t->reason = i_strdup(reason); t->itrans = mail_index_transaction_begin(box->view, itrans_flags); diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c index 540e2abc8b..8d5b7799f1 100644 --- a/src/lib-storage/mail-storage.c +++ b/src/lib-storage/mail-storage.c @@ -2177,7 +2177,6 @@ mailbox_transaction_begin(struct mailbox *box, box->transaction_count++; trans = box->v.transaction_begin(box, flags, reason); i_assert(trans->reason != NULL); - trans->flags = flags; return trans; }