From 6b39278f613b39219855572f17901351af4868a5 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 10 Jan 2011 22:53:12 -0500 Subject: [PATCH] When we 503, do it in HTML --- citadel/modules/wiki/serv_wiki.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c index 0399124b3..b24822274 100644 --- a/citadel/modules/wiki/serv_wiki.c +++ b/citadel/modules/wiki/serv_wiki.c @@ -422,7 +422,8 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp, syslog(LOG_DEBUG, "callback found rev: %s\n", this_rev); /* Perform the patch */ - fp = popen("patch -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "w"); + //fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w"); + fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>>/tmp/patcherr.txt", "w"); if (fp) { /* Replace the filenames in the patch with the tempfilename we're actually tweaking */ fprintf(fp, "--- %s\n", hecbd->tempfilename); -- 2.30.2