X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7ea8df24b32a36687cfea94e2b84272777562325..5693776ae4f48ee55ea4affa9c060a95dcc4b1be:/IkiWiki/Setup/Standard.pm?ds=sidebyside

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa0..87db648e0 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,30 +24,28 @@ 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};
 	}
 
-	if (! $config{refresh}) {
-		debug("generating wrappers..");
+	if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
+		debug(gettext("generating wrappers.."));
 		my @wrappers=@{$setup{wrappers}};
 		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);
 	}
-	else {
-		delete $setup{wrappers};
-	}
 	
 	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});
@@ -55,26 +53,35 @@ sub setup_standard {
 			elsif (ref $setup{$c} eq 'ARRAY') {
 				$config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
 			}
+			elsif (ref $setup{$c} eq 'HASH') {
+				foreach my $key (keys %{$setup{$c}}) {
+					$config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+				}
+			}
 		}
 		else {
 			$config{$c}=undef;
 		}
 	}
 
-	if (! $config{refresh}) {
+	if ($config{render}) {
+		commandline_render();
+	}
+	elsif (! $config{refresh}) {
 		$config{rebuild}=1;
-		debug("rebuilding wiki..");
+		debug(gettext("rebuilding wiki.."));
 	}
 	else {
-		debug("refreshing wiki..");
+		debug(gettext("refreshing wiki.."));
 	}
 
+	loadplugins();
 	checkconfig();
 	lockwiki();
 	loadindex();
 	refresh();
 
-	debug("done");
+	debug(gettext("done"));
 	saveindex();
 }