[Commits] [SCM] claws branch, master, updated. 3.16.0-103-ge9ddc1b

[wwp at claws-mail.org]

The branch, master has been updated
       via  e9ddc1bd3b04aca4d1803014fa6ac9af43480715 (commit)
      from  d9dab228c06ce2b968ecee7dcccd4d2cc494935c (commit)

Summary of changes:
 src/compose.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


- Log -----------------------------------------------------------------
commit e9ddc1bd3b04aca4d1803014fa6ac9af43480715
Author: wwp <wwp at free.fr>
Date:   Tue Apr 3 10:17:58 2018 +0200

    Fix broken templates attachments due to commit 814b087,
    which clears template internals (including attachments list)
    wherever template contains any field to apply (To/Subject/etc.)
    and before attachments could be processed. Simply process
    attachments before attachments list may be cleared by fields
    processing. Ideally we should change quote_fmt_reset_vartable()
    or its uses in compose.c at least.

diff --git a/src/compose.c b/src/compose.c
index b6b14e7..efb3b9c 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -8847,8 +8847,8 @@ static void compose_template_apply(Compose *compose, Template *tmpl,
 
 	/* process the other fields */
 
-	compose_template_apply_fields(compose, tmpl);
 	compose_attach_from_list(compose, quote_fmt_get_attachments_list(), FALSE);
+	compose_template_apply_fields(compose, tmpl);
 	quote_fmt_reset_vartable();
 	quote_fmtlex_destroy();
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail