projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c4ce7d
)
Wiki revs now work again - replaced --global-reject-file with -r
author
Art Cancro
<ajc@citadel.org>
Tue, 11 Jan 2011 03:59:15 +0000
(22:59 -0500)
committer
Art Cancro
<ajc@citadel.org>
Tue, 11 Jan 2011 03:59:15 +0000
(22:59 -0500)
citadel/modules/wiki/serv_wiki.c
patch
|
blob
|
history
diff --git
a/citadel/modules/wiki/serv_wiki.c
b/citadel/modules/wiki/serv_wiki.c
index 624138b1cc936845742a711452494312b5a6d075..8f306a5dd70d7be96c0e985cad0888ce8308e628 100644
(file)
--- 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.
*
* 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
*
* 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 */
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);
if (fp) {
/* Replace the filenames in the patch with the tempfilename we're actually tweaking */
fprintf(fp, "--- %s\n", hecbd->tempfilename);