diff options
author | Joey Hess <joey@kitenet.net> | 2010-04-20 18:18:39 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2010-04-20 18:18:39 -0400 |
commit | 64946f91982d85bb301cc9241459939c657d0eb9 (patch) | |
tree | b61b844a4b8ec9977ce267a911bc1e8406a0dab0 /IkiWiki/Plugin/editpage.pm | |
parent | 9fc13ab196f9ac9852962365d3330020d6720b0b (diff) | |
parent | 511f7f9cb94ebdd8ea33973a0ca74d2f8249aa3f (diff) |
Merge branch 'file_pruned_revamp'
Diffstat (limited to 'IkiWiki/Plugin/editpage.pm')
-rw-r--r-- | IkiWiki/Plugin/editpage.pm | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/editpage.pm b/IkiWiki/Plugin/editpage.pm index 44fe5514a..26e38abc1 100644 --- a/IkiWiki/Plugin/editpage.pm +++ b/IkiWiki/Plugin/editpage.pm @@ -92,9 +92,9 @@ sub cgi_editpage ($$) { # wiki_file_regexp. my ($page)=$form->field('page')=~/$config{wiki_file_regexp}/; $page=possibly_foolish_untaint($page); - my $absolute=($page =~ s#^/+##); + my $absolute=($page =~ s#^/+##); # absolute name used to force location if (! defined $page || ! length $page || - file_pruned($page, $config{srcdir})) { + file_pruned($page)) { error(gettext("bad page name")); } @@ -220,8 +220,7 @@ sub cgi_editpage ($$) { my $best_loc; if (! defined $from || ! length $from || $from ne $form->field('from') || - file_pruned($from, $config{srcdir}) || - $from=~/^\// || + file_pruned($from) || $absolute || $form->submitted) { @page_locs=$best_loc=$page; |