correct logic on error fallthrough

[ikiwiki.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 2952480b485428649425f2a02dab7d1bc1b224a6..972e3578de0103650ba5455b609a175b06ea95cf 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -95,18 +95,20 @@ sub test () {
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {

-                               next if IkiWiki::check_canedit($page, $cgi, $session, 1);
+                               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});
                        }
                        else {
                                if (IkiWiki::Plugin::attachment->can("check_canattach")) {
                                        IkiWiki::Plugin::attachment::check_canattach($session, $file, $change->{path});

-                                       next if IkiWiki::check_canedit($file, $cgi, $session, 1);
+                                       IkiWiki::check_canedit($file, $cgi, $session, 0, 1);
+                                       next;

                                }
                        }
                }
                elsif ($change->{action} eq 'remove') {
                        # check_canremove tests to see if the file is present
                                }
                        }
                }
                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
                        # 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


@@ -116,7 +118,8 @@ sub test () {
 
                        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 if IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 1);
+                               IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session, 0, 1);
+                               next;

                        }
                }
                else {
                        }
                }
                else {