X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/5bea644fdd9216ace2015d1e9ca85cde21689180..52bbdbb1a5ce994c9afac253c1d9bfd94acf4d1d:/IkiWiki/Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index b67d1a454..262d49479 100644
--- a/IkiWiki/Setup.pm
+++ b/IkiWiki/Setup.pm
@@ -36,17 +36,15 @@ sub load ($) { # {{{
 	$raw_setup=undef;
 
 	# Merge setup into existing config and untaint.
-	$setup{plugin}=$config{plugin};
 	if (exists $setup{add_plugins}) {
-		push @{$setup{plugin}}, @{$setup{add_plugins}};
-		delete $setup{add_plugins};
+		push @{$setup{add_plugins}}, @{$config{add_plugins}};
 	}
 	if (exists $setup{exclude}) {
 		push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
 	}
 	foreach my $c (keys %setup) {
 		if (defined $setup{$c}) {
-			if (! ref $setup{$c}) {
+			if (! ref $setup{$c} || ref $setup{$c} eq 'Regexp') {
 				$config{$c}=IkiWiki::possibly_foolish_untaint($setup{$c});
 			}
 			elsif (ref $setup{$c} eq 'ARRAY') {
@@ -64,4 +62,15 @@ sub load ($) { # {{{
 	}
 } #}}}
 
+sub dump ($) { #{{{
+	my $file=IkiWiki::possibly_foolish_untaint(shift);
+	
+	require IkiWiki::Setup::Standard;
+	my @dump=IkiWiki::Setup::Standard::gendump("Setup file for ikiwiki.");
+
+	open (OUT, ">", $file) || die "$file: $!";
+	print OUT "$_\n" foreach @dump;
+	close OUT;
+}
+
 1