update

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa08d0767743d5036ab9b6948a2ffd19da..b7583097daf84851b0ebc43900ae941e79677695 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,8 +30,11 @@ sub setup_standard {
                }
                delete $setup{disable_plugins};
        }
+       if (exists $setup{exclude}) {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+       }
 
-       if (! $config{refresh}) {
+       if (! $config{refresh} || $config{wrappers}) {
                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
@@ -43,9 +46,6 @@ sub setup_standard {
                }
                %config=(%startconfig);
        }
-       else {
-               delete $setup{wrappers};
-       }
        
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
@@ -55,6 +55,11 @@ sub setup_standard {
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
                        }
+                       elsif (ref $setup{$c} eq 'HASH') {
+                               foreach my $key (keys %{$setup{$c}}) {
+                                       $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+                               }
+                       }
                }
                else {
                        $config{$c}=undef;
@@ -69,6 +74,7 @@ sub setup_standard {
                debug("refreshing wiki..");
        }
 
+       loadplugins();
        checkconfig();
        lockwiki();
        loadindex();