Accidentally merged the configdb branch into master. Reverting.

[citadel.git] / citadel / modules / wiki / serv_wiki.c

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 36e010b37ee627a01cef07e187b7d12ec2d6fb8f..79845fa8a341d0d25cbc24521b8138bbac54f1b5 100644 (file)
--- a/citadel/modules/wiki/serv_wiki.c
+++ b/citadel/modules/wiki/serv_wiki.c
@@ -94,7 +94,8 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
        if (!CCC->logged_in) return(0); /* Only do this if logged in. */
 
        /* Is this a room with a Wiki in it, don't run this hook. */
-       if (CCC->room.QRdefaultview != VIEW_WIKI) {
+       if ((CCC->room.QRdefaultview != VIEW_WIKI) &&
+           (CCC->room.QRdefaultview != VIEW_WIKIMD)) {
                return(0);
        }
 
@@ -642,7 +643,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
                        CM_SetField(msg, eAuthor, CCC->user.fullname, strlen(CCC->user.fullname));
                        CM_SetField(msg, erFc822Addr, CCC->cs_inet_email, strlen(CCC->cs_inet_email));
                        CM_SetField(msg, eOriginalRoom, CCC->room.QRname, strlen(CCC->room.QRname));
-                       CM_SetField(msg, eNodeName, NODENAME, strlen(NODENAME));
+                       CM_SetField(msg, eNodeName, CFG_KEY(c_nodename));
                        CM_SetField(msg, eExclusiveID, pagename, strlen(pagename));
                        msgnum = CtdlSubmitMsg(msg, NULL, "", 0);       /* Replace the current revision */
                }