diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 22:44:19 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-07-21 22:44:19 -0400 |
| commit | 0c9fe2f99c2261bf00224120acba4fd199b28dc2 (patch) | |
| tree | fa394917f67c73bb28f9be4964f41a568168cb6a /IkiWiki/Plugin | |
| parent | f9cbe871adce4555690d5b934d67c1420f49c34e (diff) | |
use check_canattach
As noted, this may be overkill..
Diffstat (limited to 'IkiWiki/Plugin')
| -rw-r--r-- | IkiWiki/Plugin/remove.pm | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index bb5f56540..9b6655139 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -129,9 +129,6 @@ sub sessioncgi ($$) { #{{{ error(sprintf(gettext("%s does not exist"), htmllink("", "", $page, noimageinline => 1))); } - - # Must be editiable. - IkiWiki::check_canedit($page, $q, $session); # Must exist on disk, and be a regular file. my $file=$pagesources{$page}; @@ -141,12 +138,20 @@ sub sessioncgi ($$) { #{{{ elsif (-l "$config{srcdir}/$file" && ! -f _) { error(sprintf(gettext("%s is not a file"), $file)); } + + # Must be editiable. + IkiWiki::check_canedit($page, $q, $session); + + # This is sorta overkill, but better safe + # than sorry. If a user can't upload an + # attachment, don't let them delete it. + if ($q->param("attachment")) { + IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + } push @files, IkiWiki::possibly_foolish_untaint($file); } - # TODO check attachment limits. - # Do removal, and update the wiki. require IkiWiki::Render; if ($config{rcs}) { |