diff options
| -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}) { |