fix config restoration after wrapper gen

[ikiwiki.git] / IkiWiki / Setup / Standard.pm

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7be4f891a30848c394b78217f7bc0b9b2ea640dc..4d1118f304b871024b93157a4c5fea941ed96cd9 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -12,18 +12,22 @@ use strict;
 sub import {
        my %setup=%{$_[1]};
 
-
        ::debug("generating wrappers..");
-       foreach my $wrapper (@{$setup{wrapper}}) {
-               ::gen_wrapper(%::config, %setup, %{$wrapper});
+       my %startconfig=(%::config);
+       foreach my $wrapper (@{$setup{wrappers}}) {
+               %::config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               ::checkoptions();
+               ::gen_wrapper();
        }
-
+       %::config=(%startconfig);
+       
        ::debug("rebuilding wiki..");
        foreach my $c (keys %setup) {
                $::config{$c}=::possibly_foolish_untaint($setup{$c})
                        if defined $setup{$c} && ! ref $setup{$c};
        }
        $::config{rebuild}=1;
+       ::checkoptions();
        ::refresh();
 
        ::debug("done");