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/Plugin/editpage.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/Plugin/editpage.pm')
| -rw-r--r-- | IkiWiki/Plugin/editpage.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index 44fe5514a..ee1de8eaa 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -94,7 +94,7 @@ sub cgi_editpage ($$) { $page=possibly_foolish_untaint($page); my $absolute=($page =~ s#^/+##); if (! defined $page || ! length $page || - file_pruned($page, $config{srcdir})) { + file_pruned($page)) { error(gettext("bad page name")); } @@ -220,7 +220,7 @@ sub cgi_editpage ($$) { my $best_loc; if (! defined $from || ! length $from || $from ne $form->field('from') || - file_pruned($from, $config{srcdir}) || + file_pruned($from) || $from=~/^\// || $absolute || $form->submitted) { |