X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b5e2afa94390dd3349fed81f72892da3beba56ed..cdd48716be35fbc3c9351f7d46a4e4bed29bac21:/IkiWiki/Setup/Standard.pm?ds=inline

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 0c4272286..0a3496885 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -34,14 +34,18 @@ sub setup_standard {
 		delete $setup{wrappers};
 		my %startconfig=(%config);
 		foreach my $wrapper (@wrappers) {
-			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+			%config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});
 			checkconfig();
+			if (! $config{cgi} && ! $config{post_commit}) {
+				$config{post_commit}=1;
+			}
 			gen_wrapper();
 		}
 		%config=(%startconfig);
 	}
 	
 	foreach my $c (keys %setup) {
+		next if $c eq 'syslog';
 		if (defined $setup{$c}) {
 			if (! ref $setup{$c}) {
 				$config{$c}=possibly_foolish_untaint($setup{$c});
@@ -59,20 +63,25 @@ sub setup_standard {
 			$config{$c}=undef;
 		}
 	}
+	
+	if (! $config{refresh}) {
+		$config{rebuild}=1;
+	}
+	
+	loadplugins();
+	checkconfig();
 
 	if ($config{render}) {
 		commandline_render();
 	}
-	elsif (! $config{refresh}) {
-		$config{rebuild}=1;
+
+	if (! $config{refresh}) {
 		debug(gettext("rebuilding wiki.."));
 	}
 	else {
 		debug(gettext("refreshing wiki.."));
 	}
 
-	loadplugins();
-	checkconfig();
 	lockwiki();
 	loadindex();
 	refresh();