* Wrote enough of the SMTP sender to get Patriot drooling over it, but not

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index dca9cbb0cd10282829d7322112a218c7bb70641f..867ff964a8b57089e965ffb2a66b42aca2b054f3 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -289,9 +289,7 @@ void CtdlForEachMessage(int mode, long ref,
                if (content_type != NULL)
                        if (strlen(content_type) > 0)
                                for (a = 0; a < num_msgs; ++a) {
-                                       lprintf(9, "Trying %ld\n", msglist[a]);
                                        GetSuppMsgInfo(&smi, msglist[a]);
-                                       lprintf(9, "ct is %s\n", smi.smi_content_type);
                                        if (strcasecmp(smi.smi_content_type, content_type)) {
                                                msglist[a] = 0L;
                                        }
@@ -1628,8 +1626,16 @@ long CtdlSaveMsg(struct CtdlMessage *msg,        /* message to save */
        }
 
        lprintf(9, "Possibly relocating\n");
-       if (strcasecmp(actual_rm, CC->quickroom.QRname))
+       if (strcasecmp(actual_rm, CC->quickroom.QRname)) {
                getroom(&CC->quickroom, actual_rm);
+       }
+
+       /*
+        * If this message has no O (room) field, generate one.
+        */
+       if (msg->cm_fields['O'] == NULL) {
+               msg->cm_fields['O'] = strdoop(CC->quickroom.QRname);
+       }
 
        /* Perform "before save" hooks (aborting if any return nonzero) */
        lprintf(9, "Performing before-save hooks\n");