diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-17 19:05:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-17 19:05:40 -0400 |
| commit | a97964688b73d0a3237c798dce3fb064ff29ff11 (patch) | |
| tree | 6a3ca565cd89b6b69b736ccc391b4ec1aba87421 /IkiWiki/Receive.pm | |
| parent | e289e0b4ba48d01e24586dbdcaeda367763edd67 (diff) | |
| download | ikiwiki-a97964688b73d0a3237c798dce3fb064ff29ff11.tar ikiwiki-a97964688b73d0a3237c798dce3fb064ff29ff11.tar.gz | |
unfinished file_prune revamp
Many calls to file_prune were incorrectly calling it with 2 parameters.
In cases where the filename being checked is relative to the srcdir,
that is not needed.
Made absolute filenames be pruned. (This won't work for the 2 parameter call
style.)
Diffstat (limited to 'IkiWiki/Receive.pm')
| -rw-r--r-- | IkiWiki/Receive.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index cd94d0938..ae1bd8bef 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -82,7 +82,7 @@ sub test () { my ($file)=$change->{file}=~/$config{wiki_file_regexp}/; $file=IkiWiki::possibly_foolish_untaint($file); if (! defined $file || ! length $file || - IkiWiki::file_pruned($file, $config{srcdir})) { + IkiWiki::file_pruned($file)) { error(gettext("bad file name %s"), $file); } |