X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c401b6958af7e12c1c2c46f870691bfb0a998fd3..3fe434189b99daf3d8cc075186c4ed4ebdd43b8f:/IkiWiki/Setup.pm?ds=sidebyside

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index f34571bcf..453d19670 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -132,7 +132,6 @@ sub disabled_plugins (@) {
 		my $pid=fork();
 		if ($pid == 0) {
 			foreach my $plugin (@_) {
-				print STDERR "** plugin $plugin disabled\n";
 				eval { IkiWiki::loadplugin($plugin, 1) };
 				if (exists $IkiWiki::hooks{disable}{$plugin}{call}) {
 					eval { $IkiWiki::hooks{disable}{$plugin}{call}->() };
@@ -173,6 +172,11 @@ sub getsetup () {
 			my @s=eval { $IkiWiki::hooks{getsetup}{$plugin}{call}->() };
 			next unless @s;
 
+			if (scalar(@s) % 2 != 0) {
+				print STDERR "warning: plugin $plugin has a broken getsetup; ignoring\n";
+				next;
+			}
+
 			# set default section value (note use of shared
 			# hashref between array and hash)
 			my %s=@s;
@@ -224,6 +228,10 @@ sub commented_dump ($$) {
 		my $setup=$pair->[1];
 		my %s=@{$setup};
 		my $section=$s{plugin}->{section};
+		if (! defined $section) {
+			print STDERR "warning: missing section in $plugin\n";
+			$section="other";
+		}
 		push @{$section_plugins{$section}}, $plugin;
 		if (@{$section_plugins{$section}} == 1) {
 			push @ret, "", $indent.("#" x 70), "$indent# $section plugins",