X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/f398ad035b973608d380c9939ea845d8e2a0cdc2..70db57134a73cde5cafac0f02a3858a22d44ed26:/IkiWiki/Receive.pm diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm index fdd463025..972e3578d 100644 --- a/IkiWiki/Receive.pm +++ b/IkiWiki/Receive.pm @@ -95,21 +95,20 @@ 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; - } + IkiWiki::check_canedit($page, $cgi, $session, 0, 1); + next; } else { if (IkiWiki::Plugin::attachment->can("check_canattach")) { IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path}); + IkiWiki::check_canedit($file, $cgi, $session, 0, 1); next; } } } elsif ($change->{action} eq 'remove') { # check_canremove tests to see if the file is present - # on disk. This will fail is a single commit adds a + # on disk. This will fail when a single commit adds a # file and then removes it again. Avoid the problem # by not testing the removal in such pairs of changes. # (The add is still tested, just to make sure that @@ -119,6 +118,7 @@ sub test () { if (IkiWiki::Plugin::remove->can("check_canremove")) { IkiWiki::Plugin::remove::check_canremove(defined $page ? $page : $file, $cgi, $session); + IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1); next; } }