refactor

[ikiwiki.git] / IkiWiki / Setup.pm

diff --git a/IkiWiki/Setup.pm b/IkiWiki/Setup.pm
index b67d1a45417149758f7b6ce2cfc882ba02ed51af..adb8abb6280199527667d03ad1ede171f74a3824 100644 (file)
--- 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,14 @@ sub load ($) { # {{{
        }
 } #}}}
 
+sub dump ($) { #{{{
+       my $file=IkiWiki::possibly_foolish_untaint(shift);
+       
+       require IkiWiki::Setup::Standard;
+
+       open (OUT, ">", $file) || die "$file: $!";
+       print OUT "$_\n" foreach IkiWiki::Setup::Standard::gendump();
+       close OUT;
+}
+
 1