X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/912521ef0711204965aa2319d41c7741bd3f4f4c..00503f25cdd892de521983a29f7e3d96a32801c8:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 1e65b23e3..0a3496885 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,12 +24,6 @@ sub setup_standard {
 		push @{$setup{plugin}}, @{$setup{add_plugins}};
 		delete $setup{add_plugins};
 	}
-	if (exists $setup{disable_plugins}) {
-		foreach my $plugin (@{$setup{disable_plugins}}) {
-			$setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-		}
-		delete $setup{disable_plugins};
-	}
 	if (exists $setup{exclude}) {
 		push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
 	}
@@ -40,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});
@@ -65,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();