From 1c00717cb2737bde3870b2fe504f40bb7d215477 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 26 Jul 2008 15:34:38 -0400 Subject: can now dump fully functional setup files --- IkiWiki/Setup.pm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'IkiWiki/Setup.pm') diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm index b67d1a454..9c45a8baf 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') { -- cgit v1.2.3