mixing template vars into directive arguments

[git.ikiwiki.info.git] / IkiWiki / Receive.pm

diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 3a5f91758363bd6cd4521af3a7a6e966c2c91488..e77c477a98ad743b6db8d584067cff1cba992be3 100644 (file)
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -95,12 +95,14 @@ sub test () {
                if ($change->{action} eq 'change' ||
                    $change->{action} eq 'add') {
                        if (defined $page) {
-                               IkiWiki::check_canedit($page, $cgi, $session, 0, 1);
+                               IkiWiki::check_canedit($page, $cgi, $session);
+                               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);
+                                       IkiWiki::check_canedit($file, $cgi, $session);
+                                       next;
                                }
                        }
                }
@@ -116,12 +118,15 @@ 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);
+                               IkiWiki::check_canedit(defined $page ? $page : $file, $cgi, $session);
+                               next;
                        }
                }
                else {
                        error "unknown action ".$change->{action};
                }
+               
+               error sprintf(gettext("you are not allowed to change %s"), $file);
        }
 
        exit 0;