X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/7ea8df24b32a36687cfea94e2b84272777562325..db15adb019142cc5e6c17bf5f90e9544f758cee1:/IkiWiki/Setup/Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa0..b7583097d 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,8 +30,11 @@ sub setup_standard {
 		}
 		delete $setup{disable_plugins};
 	}
+	if (exists $setup{exclude}) {
+		$config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+	}
 
-	if (! $config{refresh}) {
+	if (! $config{refresh} || $config{wrappers}) {
 		debug("generating wrappers..");
 		my @wrappers=@{$setup{wrappers}};
 		delete $setup{wrappers};
@@ -43,9 +46,6 @@ sub setup_standard {
 		}
 		%config=(%startconfig);
 	}
-	else {
-		delete $setup{wrappers};
-	}
 	
 	foreach my $c (keys %setup) {
 		if (defined $setup{$c}) {
@@ -55,6 +55,11 @@ 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;
@@ -69,6 +74,7 @@ sub setup_standard {
 		debug("refreshing wiki..");
 	}
 
+	loadplugins();
 	checkconfig();
 	lockwiki();
 	loadindex();