From: Joey Hess <joey@kodama.kitenet.net>
Date: Mon, 7 Jan 2008 21:35:16 +0000 (-0500)
Subject: fixes
X-Git-Tag: 2.19~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/c34895364f10955f2acf1f8c70fda72b83132eb8?ds=sidebyside;hp=-c

fixes
---

c34895364f10955f2acf1f8c70fda72b83132eb8
diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index a6695b3a5..ea75caf9c 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -57,7 +57,6 @@ sub check_canedit ($$$;$) { #{{{
 	my $nonfatal=shift;
 	
 	my $canedit;
-	my $callback;
 	run_hooks(canedit => sub {
 		return if defined $canedit;
 		my $ret=shift->($page, $q, $session);
@@ -66,12 +65,12 @@ sub check_canedit ($$$;$) { #{{{
 				$canedit=1;
 			}
 			elsif (ref $ret eq 'CODE') {
+				$ret->() unless $nonfatal;
 				$canedit=0;
-				$callback->() unless $nonfatal;
 			}
 			elsif (defined $ret) {
-				$canedit=0;
 				error($ret) unless $nonfatal;
+				$canedit=0;
 			}
 		}
 	});