X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=citadel%2Fmsgbase.c;h=68c94cca054f6794f839db089562124a0a1ea113;hp=3919cf911c93a2526d71fbb95edecef0e39b5375;hb=d8ea0b390e111014f00a43ed0acf3aeb53987901;hpb=1b6ce4c45c7312af6a40f4e4952101c0ec4b26d4

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index 3919cf911..68c94cca0 100644
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -2595,7 +2595,6 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
 		"CtdlSaveMsgPointersInRoom(room=%s, num_msgs=%d, repl=%d, suppress_rca=%d)\n",
 		roomname, num_newmsgs, do_repl_check, suppress_refcount_adj
 	);
-	if (num_newmsgs > 0) for (i=0; i<num_newmsgs; ++i) syslog(LOG_DEBUG, "\033[33mmerge %ld\033[0m", newmsgidlist[i]);
 
 	strcpy(hold_rm, CC->room.QRname);
 
@@ -2642,10 +2641,6 @@ int CtdlSaveMsgPointersInRoom(char *roomname, long newmsgidlist[], int num_newms
 		}
 		if (unique) {
 			msgs_to_be_merged[num_msgs_to_be_merged++] = newmsgidlist[i];
-			syslog(LOG_DEBUG, "\033[32mmsg %ld is being merged\033[0m", newmsgidlist[i]);
-		}
-		else {
-			syslog(LOG_DEBUG, "\033[31mmsg %ld is not unique\033[0m", newmsgidlist[i]);
 		}
 	}
 
@@ -3222,14 +3217,18 @@ long CtdlSubmitMsg(struct CtdlMessage *msg,	/* message to save */
 			}
 			else {
 				syslog(LOG_DEBUG, "No user <%s>\n", recipient);
-				CtdlSaveMsgPointerInRoom(config.c_aideroom,
-							 newmsgid, 0, msg);
+				CtdlSaveMsgPointerInRoom(config.c_aideroom, newmsgid, 0, msg);
 			}
 		}
 
 	/* Perform "after save" hooks */
 	syslog(LOG_DEBUG, "Performing after-save hooks\n");
+	if (msg->cm_fields['3'] != NULL) free(msg->cm_fields['3']);
+	msg->cm_fields['3'] = malloc(20);
+	snprintf(msg->cm_fields['3'], 20, "%ld", newmsgid);
 	PerformMessageHooks(msg, EVT_AFTERSAVE);
+	free(msg->cm_fields['3']);
+	msg->cm_fields['3'] = NULL;
 
 	/* For IGnet mail, we have to save a new copy into the spooler for
 	 * each recipient, with the R and D fields set to the recipient and