X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/6f1539320b7b2701d391c9921177b31898767bb7..79676ca44561a412a2d4d1b98f28c14b55048125:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f6adb360a..7eef4c320 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1536,15 +1536,19 @@ sub run_hooks ($$) {
 	my $sub=shift;
 
 	if (exists $hooks{$type}) {
-		my @deferred;
+		my (@first, @middle, @last);
 		foreach my $id (keys %{$hooks{$type}}) {
-			if ($hooks{$type}{$id}{last}) {
-				push @deferred, $id;
-				next;
+			if ($hooks{$type}{$id}{first}) {
+				push @first, $id;
+			}
+			elsif ($hooks{$type}{$id}{last}) {
+				push @last, $id;
+			}
+			else {
+				push @middle, $id;
 			}
-			$sub->($hooks{$type}{$id}{call});
 		}
-		foreach my $id (@deferred) {
+		foreach my $id (@first, @middle, @last) {
 			$sub->($hooks{$type}{$id}{call});
 		}
 	}
@@ -1654,7 +1658,7 @@ sub gettext {
 sub yesno ($) {
 	my $val=shift;
 
-	return (defined $val && lc($val) eq gettext("yes"));
+	return (defined $val && (lc($val) eq gettext("yes") || lc($val) eq "yes" || $val eq "1"));
 }
 
 sub inject {