From 526601430c6d4b115aa1104646d299933d12a24f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 10 Jan 2011 22:59:15 -0500 Subject: [PATCH] Wiki revs now work again - replaced --global-reject-file with -r --- citadel/modules/wiki/serv_wiki.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/citadel/modules/wiki/serv_wiki.c b/citadel/modules/wiki/serv_wiki.c index 624138b1c..8f306a5dd 100644 --- a/citadel/modules/wiki/serv_wiki.c +++ b/citadel/modules/wiki/serv_wiki.c @@ -1,9 +1,7 @@ /* - * $Id$ - * * Server-side module for Wiki rooms. This handles things like version control. * - * Copyright (c) 2009 by the citadel.org team + * Copyright (c) 2009-2011 by the citadel.org team * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -424,7 +422,7 @@ void wiki_rev_callback(char *name, char *filename, char *partnum, char *disp, CtdlLogPrintf(CTDL_DEBUG, "callback found rev: %s\n", this_rev); /* Perform the patch */ - fp = popen("patch -f -s -p0 --global-reject-file=/dev/null >/dev/null 2>/dev/null", "w"); + fp = popen("patch -f -s -p0 -r /dev/null >/dev/null 2>/dev/null", "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