X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/4c2f46e3fa34238bbdd093f0b3d211103a3b94a3..b7458c48d8a85866fdc7c074b1571e2f623acc2c:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 051c11b43..64ef6585f 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -172,14 +172,14 @@ sub getsetup () { #{{{
 	},
 	verbose => {
 		type => "boolean",
-		default => 0,
+		example => 1,
 		description => "display verbose messages when building?",
 		safe => 1,
 		rebuild => 0,
 	},
 	syslog => {
 		type => "boolean",
-		default => 0,
+		example => 1,
 		description => "log to syslog?",
 		safe => 1,
 		rebuild => 0,
@@ -354,6 +354,13 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
+	setup => {
+		type => "internal",
+		default => undef,
+		description => "running in setup mode",
+		safe => 0,
+		rebuild => 0,
+	},
 	refresh => {
 		type => "internal",
 		default => 0,
@@ -375,10 +382,10 @@ sub getsetup () { #{{{
 		safe => 0,
 		rebuild => 0,
 	},
-	setup => {
+	setupfile => {
 		type => "internal",
 		default => undef,
-		description => "setup file to read",
+		description => "path to setup file",
 		safe => 0,
 		rebuild => 0,
 	},
@@ -464,7 +471,9 @@ sub loadplugins () { #{{{
 		unshift @INC, possibly_foolish_untaint($config{libdir});
 	}
 
-	loadplugin($_) foreach @{$config{default_plugins}}, @{$config{add_plugins}};
+	foreach my $plugin (@{$config{default_plugins}}, @{$config{add_plugins}}) {
+		loadplugin($plugin);
+	}
 	
 	if ($config{rcs}) {
 		if (exists $IkiWiki::hooks{rcs}) {
@@ -1043,6 +1052,8 @@ sub preprocess ($$$;$$) { #{{{
 		my $prefix=shift;
 		my $command=shift;
 		my $params=shift;
+		$params="" if ! defined $params;
+
 		if (length $escape) {
 			return "[[$prefix$command $params]]";
 		}
@@ -1176,8 +1187,7 @@ sub preprocess ($$$;$$) { #{{{
 		}sx;
 	}
 
-	# $4 can be undef if the directive was [[!foo]]
-	$content =~ s{$regex}{$handle->($1, $2, $3, ($4 or ""))}eg;
+	$content =~ s{$regex}{$handle->($1, $2, $3, $4)}eg;
 	return $content;
 } #}}}