X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/170a6de6ab040e4d8e173a28d128c4ae07ac4191..a5fdf4714732c754c6bee16ff65fa85968737010:/IkiWiki/Setup/Standard.pm?ds=sidebyside

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index a13e7805a..786ba70ac 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -21,18 +21,34 @@ sub setup_standard {
 
 	if (! $config{refresh}) {
 		debug("generating wrappers..");
+		my @wrappers=@{$setup{wrappers}};
+		delete $setup{wrappers};
 		my %startconfig=(%config);
-		foreach my $wrapper (@{$setup{wrappers}}) {
+		foreach my $wrapper (@wrappers) {
 			%config=(%startconfig, verbose => 0, %setup, %{$wrapper});
 			checkconfig();
 			gen_wrapper();
 		}
 		%config=(%startconfig);
 	}
+	else {
+		delete $setup{wrappers};
+	}
+	
 	foreach my $c (keys %setup) {
-		$config{$c}=possibly_foolish_untaint($setup{$c})
-			if defined $setup{$c} && ! ref $setup{$c};
+		if (defined $setup{$c}) {
+			if (! ref $setup{$c}) {
+				$config{$c}=possibly_foolish_untaint($setup{$c});
+			}
+			elsif (ref $setup{$c} eq 'ARRAY') {
+				$config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
+			}
+		}
+		else {
+			$config{$c}=undef;
+		}
 	}
+
 	if (! $config{refresh}) {
 		$config{rebuild}=1;
 		debug("rebuilding wiki..");