diff options
author | Joey Hess <joey@kodama.kitenet.net> | 2008-10-24 13:29:30 -0400 |
---|---|---|
committer | Joey Hess <joey@kodama.kitenet.net> | 2008-10-24 13:29:30 -0400 |
commit | fbcb8553df1f6150f2cfb2fd5d81a65e93074ac5 (patch) | |
tree | bcbe16fa023088f51b18459e614205d4459a843a | |
parent | 0fde74b012781b41b3b1c844006062bcb1ae49ca (diff) | |
download | ikiwiki-fbcb8553df1f6150f2cfb2fd5d81a65e93074ac5.tar ikiwiki-fbcb8553df1f6150f2cfb2fd5d81a65e93074ac5.tar.gz |
really fix calls to check_can*
-rw-r--r-- | IkiWiki/Receive.pm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index 33f548a14..c69911a7c 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -58,15 +58,15 @@ sub test () { #{{{ if ($change->{action} eq 'change' || $change->{action} eq 'add') { if (defined $page) { - if (IkiWiki->can("check_canedit") && - IkiWiki::check_canedit($page, $cgi, $session)) { - next; + if (IkiWiki->can("check_canedit")) { + IkiWiki::check_canedit($page, $cgi, $session); + next; } } else { - if (IkiWiki::Plugin::attachment->can("check_canattach") && - IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path})) { - next; + if (IkiWiki::Plugin::attachment->can("check_canattach")) { + IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); + next; } } } @@ -80,15 +80,15 @@ sub test () { #{{{ # could add.) next if $newfiles{$file}; - if (IkiWiki::Plugin::remove->can("check_canremove") && - IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session)) { + if (IkiWiki::Plugin::remove->can("check_canremove")) { + IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); next; } } else { error "unknown action ".$change->{action}; } - + error sprintf(gettext("you are not allowed to change %s"), $file); } |