aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-08-30 18:20:34 -0400
committerJoey Hess <joey@kitenet.net>2010-08-30 18:20:34 -0400
commit70db57134a73cde5cafac0f02a3858a22d44ed26 (patch)
treefddf0df3ea5a60497e652d1d15a1c501fd138109
parent8030ecac02a743e930e480650e8c14413f26d9a2 (diff)
downloadikiwiki-70db57134a73cde5cafac0f02a3858a22d44ed26.tar
ikiwiki-70db57134a73cde5cafac0f02a3858a22d44ed26.tar.gz
correct logic on error fallthrough
-rw-r--r--IkiWiki/Receive.pm5
1 files changed, 5 insertions, 0 deletions
diff --git a/IkiWiki/Receive.pm b/IkiWiki/Receive.pm
index 3a5f91758..972e3578d 100644
--- a/IkiWiki/Receive.pm
+++ b/IkiWiki/Receive.pm
@@ -96,11 +96,13 @@ sub test () {
$change->{action} eq 'add') {
if (defined $page) {
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;
}
}
}
@@ -117,11 +119,14 @@ 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;
}
}
else {
error "unknown action ".$change->{action};
}
+
+ error sprintf(gettext("you are not allowed to change %s"), $file);
}
exit 0;