X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Fwiki%2Fserv_wiki.c;h=20a3103981044703f74fbb5208a2164ead4d0fa0;hb=cf09c5cb779279f9ad24545e68414edc0340d6fa;hp=36e010b37ee627a01cef07e187b7d12ec2d6fb8f;hpb=72cf2e7f757fd0d4e977be9154222be3af77b59c;p=citadel.git

diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c
index 36e010b37..20a310398 100644
--- 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);
 	}
 
@@ -126,7 +127,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 	/* See if we can retrieve the previous version. */
 	old_msgnum = CtdlLocateMessageByEuid(msg->cm_fields[eExclusiveID], &CCC->room);
 	if (old_msgnum > 0L) {
-		old_msg = CtdlFetchMessage(old_msgnum, 1);
+		old_msg = CtdlFetchMessage(old_msgnum, 1, 1);
 	}
 	else {
 		old_msg = NULL;
@@ -207,7 +208,7 @@ int wiki_upload_beforesave(struct CtdlMessage *msg, recptypes *recp) {
 	history_msgnum = CtdlLocateMessageByEuid(history_page, &CCC->room);
 	history_msg = NULL;
 	if (history_msgnum > 0L) {
-		history_msg = CtdlFetchMessage(history_msgnum, 1);
+		history_msg = CtdlFetchMessage(history_msgnum, 1, 1);
 	}
 
 	/* Create a new history message if necessary */
@@ -389,7 +390,7 @@ void wiki_history(char *pagename) {
 	snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
 	msgnum = CtdlLocateMessageByEuid(history_page_name, &CC->room);
 	if (msgnum > 0L) {
-		msg = CtdlFetchMessage(msgnum, 1);
+		msg = CtdlFetchMessage(msgnum, 1, 1);
 	}
 	else {
 		msg = NULL;
@@ -521,7 +522,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 	 */
 	msgnum = CtdlLocateMessageByEuid(pagename, &CCC->room);
 	if (msgnum > 0L) {
-		msg = CtdlFetchMessage(msgnum, 1);
+		msg = CtdlFetchMessage(msgnum, 1, 1);
 	}
 	else {
 		msg = NULL;
@@ -555,7 +556,7 @@ void wiki_rev(char *pagename, char *rev, char *operation)
 	snprintf(history_page_name, sizeof history_page_name, "%s_HISTORY_", pagename);
 	msgnum = CtdlLocateMessageByEuid(history_page_name, &CCC->room);
 	if (msgnum > 0L) {
-		msg = CtdlFetchMessage(msgnum, 1);
+		msg = CtdlFetchMessage(msgnum, 1, 1);
 	}
 	else {
 		msg = NULL;
@@ -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 */
 		}