* Bugfixes

[citadel.git] / citadel / msgbase.c

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 0123fd39cae032aa2f94e4aea69e15ae4a53c91f..94405b53fc5465d02a5a869fdb6d75bca9eb4cc2 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1066,7 +1066,7 @@ int CtdlOutputMsg(long msg_num,           /* message number (local) to fetch */
        else {
                TheMessage = CtdlFetchMessage(msg_num);
                if (CC->cached_msg != NULL) {
-                       phree(CC->cached_msg);
+                       phree(CC->cached_msg); /* FIXME efence? */
                }
                CC->cached_msg = TheMessage;
                CC->cached_msgnum = msg_num;
@@ -2142,7 +2142,7 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,       /* message to save */
  * Convenience function for generating small administrative messages.
  */
 void quickie_message(char *from, char *to, char *room, char *text, 
-                       int format_type)
+                       int format_type, char *subject)
 {
        struct CtdlMessage *msg;
        struct recptypes *recp = NULL;
@@ -2159,6 +2159,9 @@ void quickie_message(char *from, char *to, char *room, char *text,
                msg->cm_fields['R'] = strdoop(to);
                recp = validate_recipients(to);
        }
+       if (subject != NULL) {
+               msg->cm_fields['U'] = strdoop(subject);
+       }
        msg->cm_fields['M'] = strdoop(text);
 
        CtdlSubmitMsg(msg, recp, room);