From 315328a1ce346a8b92cfed2278ac85f586c3c2ad 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 d2c4e57724..ee21925ed9 100644 --- a/src/lib-storage/index/index-transaction.c +++ b/src/lib-storage/index/index-transaction.c @@ -158,6 +158,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->itrans = mail_index_transaction_begin(box->view, itrans_flags); t->view = mail_index_transaction_open_updated_view(t->itrans); diff --git a/src/lib-storage/mail-storage.c b/src/lib-storage/mail-storage.c index fd2fe67b7a..da3553251f 100644 --- a/src/lib-storage/mail-storage.c +++ b/src/lib-storage/mail-storage.c @@ -2098,7 +2098,6 @@ mailbox_transaction_begin(struct mailbox *box, box->transaction_count++; trans = box->v.transaction_begin(box, flags); - trans->flags = flags; return trans; }