From: Joey Hess <joey@kitenet.net>
Date: Mon, 30 Aug 2010 22:20:34 +0000 (-0400)
Subject: correct logic on error fallthrough
X-Git-Tag: 3.20100831~7
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=70db57134a73cde5cafac0f02a3858a22d44ed26;p=ikiwiki.git

correct logic on error fallthrough
---

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;