* Don't do hooks during cmd_ent3()

diff --git a/citadel/msgbase.c b/citadel/msgbase.c
index c64ca671611e421b622812d96dea76b50fe51d49..b3fce5047b6d088cee8e3f63ab47deab9c9aaef7 100644 (file)
--- a/citadel/msgbase.c
+++ b/citadel/msgbase.c
@@ -1780,6 +1780,7 @@ void cmd_ent3(char *entargs)
                msg->cm_fields[which_field] = strdoop(tempbuf);
        }
 
+       msg->cm_flags = CM_SKIP_HOOKS;
        CtdlSaveMsg(msg, recp, "", e, 0);
        CtdlFreeMessage(msg);
        phree(tempbuf);

diff --git a/citadel/serv_vcard.c b/citadel/serv_vcard.c
index 97088083adeca9a434385a47c3573ad9ff912636..1881a2318cde8da898e1b6fe69c7e586569bc09e 100644 (file)
--- a/citadel/serv_vcard.c
+++ b/citadel/serv_vcard.c
@@ -240,7 +240,6 @@ void vcard_write_user(struct usersupp *u, struct vCard *v) {
 
         fp = fopen(temp, "w");
         if (fp == NULL) return;
-       fprintf(fp, "Content-type: text/x-vcard\r\n\r\n");
        if (ser == NULL) {
                fprintf(fp, "begin:vcard\r\nend:vcard\r\n");
        } else {