]> sipb.mit.edu Git - ikiwiki.git/blobdiff - IkiWiki/Receive.pm
Receive: avoid hiding check_canedit error messages
[ikiwiki.git] / IkiWiki / Receive.pm
index cd746c95fdf97cf9c648f3a0554fb355fca6a85f..3a5f91758363bd6cd4521af3a7a6e966c2c91488 100644 (file)
@@ -95,12 +95,12 @@ 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);
                        }
                        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);
                                }
                        }
                }
                                }
                        }
                }
@@ -116,14 +116,12 @@ 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);
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
-               
-               error sprintf(gettext("you are not allowed to change %s"), $file);
        }
 
        exit 0;
        }
 
        exit 0;