diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-09-23 17:42:38 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-09-23 17:42:38 -0400 |
commit | 544da9b0daf15b1d634d8f9b449ea94024ab551a (patch) | |
tree | dfaa695339783c2670e0711906e6680fa1752bef /IkiWiki/Plugin/remove.pm | |
parent | cf4db49567d658e9de84e1b9c34a66cffac51fd2 (diff) | |
parent | 8e0180d8ca6c9b08ed752b92d4c50a5298d8f55a (diff) |
Merge branch 'master' into tova
Diffstat (limited to 'IkiWiki/Plugin/remove.pm')
-rw-r--r-- | IkiWiki/Plugin/remove.pm | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/IkiWiki/Plugin/remove.pm b/IkiWiki/Plugin/remove.pm index 9666408bc..869d32f93 100644 --- a/IkiWiki/Plugin/remove.pm +++ b/IkiWiki/Plugin/remove.pm @@ -21,11 +21,10 @@ sub getsetup () { #{{{ }, } #}}} -sub check_canremove ($$$$) { #{{{ +sub check_canremove ($$$) { #{{{ my $page=shift; my $q=shift; my $session=shift; - my $attachment=shift; # Must be a known source file. if (! exists $pagesources{$page}) { @@ -45,11 +44,15 @@ sub check_canremove ($$$$) { #{{{ # 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 ($attachment) { - IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + # If a user can't upload an attachment, don't let them delete it. + # This is sorta overkill, but better safe than sorry. + if (! defined IkiWiki::pagetype($pagesources{$page})) { + if (IkiWiki::Plugin::attachment->can("check_canattach")) { + IkiWiki::Plugin::attachment::check_canattach($session, $page, $file); + } + else { + error("renaming of attachments is not allowed"); + } } } #}}} @@ -94,7 +97,7 @@ sub removal_confirm ($$@) { #{{{ my $attachment=shift; my @pages=@_; - check_canremove($_, $q, $session, $attachment) foreach @pages; + check_canremove($_, $q, $session) foreach @pages; # Save current form state to allow returning to it later # without losing any edits. @@ -167,7 +170,7 @@ sub sessioncgi ($$) { #{{{ # and that the user is allowed to edit(/remove) it. my @files; foreach my $page (@pages) { - check_canremove($page, $q, $session, $q->param("attachment")); + check_canremove($page, $q, $session); # This untaint is safe because of the # checks performed above, which verify the |