forgot to add this

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index d42ceffa08d0767743d5036ab9b6948a2ffd19da..b1418ae34743272c583e35cdbe915026a236c258 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -30,22 +30,20 @@ sub setup_standard {
                }
                delete $setup{disable_plugins};
        }
-
-       if (! $config{refresh}) {
-               debug("generating wrappers..");
-               my @wrappers=@{$setup{wrappers}};
-               delete $setup{wrappers};
-               my %startconfig=(%config);
-               foreach my $wrapper (@wrappers) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
-                       checkconfig();
-                       gen_wrapper();
-               }
-               %config=(%startconfig);
+       if (exists $setup{exclude}) {
+               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
        }
-       else {
-               delete $setup{wrappers};
+
+       debug("generating wrappers..");
+       my @wrappers=@{$setup{wrappers}};
+       delete $setup{wrappers};
+       my %startconfig=(%config);
+       foreach my $wrapper (@wrappers) {
+               %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+               checkconfig();
+               gen_wrapper();
        }
+       %config=(%startconfig);
        
        foreach my $c (keys %setup) {
                if (defined $setup{$c}) {
@@ -69,6 +67,7 @@ sub setup_standard {
                debug("refreshing wiki..");
        }
 
+       loadplugins();
        checkconfig();
        lockwiki();
        loadindex();