From: Wilfried Goesgens <dothebart@citadel.org>
Date: Thu, 19 Jul 2012 20:07:54 +0000 (+0200)
Subject: Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x
X-Git-Tag: v8.14~5
X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=7594f9e0850548e6edc6b5d0db91bb9f810b8b8a;hp=f2d517832a2ec1a263713ece725b5529781676fa;p=citadel.git

Merge branch 'stable-81x' of ssh://git.citadel.org/appl/gitroot/citadel into stable-81x
---

diff --git a/webcit/msg_renderers.c b/webcit/msg_renderers.c
index 123cfc477..93ad16772 100644
--- a/webcit/msg_renderers.c
+++ b/webcit/msg_renderers.c
@@ -388,7 +388,7 @@ void examine_replyto(message_summary *Msg, StrBuf *HdrLine, StrBuf *FoundCharset
 }
 void tmplput_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	message_summary *Msg = (message_summary*) CTX;
 	StrBufAppendTemplate(Target, TP, Msg->ReplyTo, 0);
 }
 
@@ -456,7 +456,7 @@ int Conditional_MAIL_SUMM_CCCC(StrBuf *Target, WCTemplputParams *TP)
 }
 int Conditional_MAIL_SUMM_REPLYTO(StrBuf *Target, WCTemplputParams *TP)
 {
-	message_summary *Msg = (message_summary*) CTX(CTX_MAILSUM);
+	message_summary *Msg = (message_summary*) CTX;
 	return StrLength(Msg->ReplyTo) > 0;
 }