From: Art Cancro <ajc@citadel.org>
Date: Tue, 12 May 2009 21:31:44 +0000 (+0000)
Subject: * Fixed a bug that caused vnotes not to display when encapsulated in multipart/altern... 
X-Git-Tag: v7.86~1172
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=b14ad70b1de7363ca00ebebb63ad11ace29cfe8a

* Fixed a bug that caused vnotes not to display when encapsulated in multipart/alternative because mime_content_type was used where msg4_content_type should have been used.
---

diff --git a/webcit/notes.c b/webcit/notes.c
index 4d78d2a93..a8e02b04c 100644
--- a/webcit/notes.c
+++ b/webcit/notes.c
@@ -95,10 +95,9 @@ struct vnote *vnote_new_from_msg(long msgnum,int unread)
 			}
 			else {
 				phase++;
-				
 				if ((msg4_content_length > 0)
 				    && ( !strcasecmp(msg4_content_encoding, "7bit"))
-				    && (!strcasecmp(mime_content_type, "text/vnote"))
+				    && (!strcasecmp(msg4_content_type, "text/vnote"))
 				) { 
 					vnote_inline = 1;
 				}
@@ -188,6 +187,7 @@ void write_vnote_to_server(struct vnote *v)
 	
 		serv_printf("--%s", boundary);
 		serv_puts("Content-type: text/vnote");
+		serv_puts("Content-Transfer-Encoding: 7bit");
 		serv_puts("");
 		pch = vnote_serialize(v);
 		serv_puts(pch);