web commit by simon

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 7512c258758eb7e7a577d73e08b2679dc5a6e6b0..0a34968855a2cd26ac4609d27b73b2d0e440ea76 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -24,30 +24,28 @@ sub setup_standard {
                push @{$setup{plugin}}, @{$setup{add_plugins}};
                delete $setup{add_plugins};
        }
-       if (exists $setup{disable_plugins}) {
-               foreach my $plugin (@{$setup{disable_plugins}}) {
-                       $setup{plugin}=[grep { $_ ne $plugin } @{$setup{plugin}}];
-               }
-               delete $setup{disable_plugins};
-       }
        if (exists $setup{exclude}) {
-               $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
+               push @{$config{wiki_file_prune_regexps}}, $setup{exclude};
        }
 
        if (! $config{render} && (! $config{refresh} || $config{wrappers})) {
-               debug("generating wrappers..");
+               debug(gettext("generating wrappers.."));
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
                my %startconfig=(%config);
                foreach my $wrapper (@wrappers) {
-                       %config=(%startconfig, verbose => 0, %setup, %{$wrapper});
+                       %config=(%startconfig, rebuild => 0, verbose => 0, %setup, %{$wrapper});
                        checkconfig();
+                       if (! $config{cgi} && ! $config{post_commit}) {
+                               $config{post_commit}=1;
+                       }
                        gen_wrapper();
                }
                %config=(%startconfig);
        }
        
        foreach my $c (keys %setup) {
+               next if $c eq 'syslog';
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});
@@ -65,25 +63,30 @@ sub setup_standard {
                        $config{$c}=undef;
                }
        }
+       
+       if (! $config{refresh}) {
+               $config{rebuild}=1;
+       }
+       
+       loadplugins();
+       checkconfig();
 
        if ($config{render}) {
                commandline_render();
        }
-       elsif (! $config{refresh}) {
-               $config{rebuild}=1;
-               debug("rebuilding wiki..");
+
+       if (! $config{refresh}) {
+               debug(gettext("rebuilding wiki.."));
        }
        else {
-               debug("refreshing wiki..");
+               debug(gettext("refreshing wiki.."));
        }
 
-       loadplugins();
-       checkconfig();
        lockwiki();
        loadindex();
        refresh();
 
-       debug("done");
+       debug(gettext("done"));
        saveindex();
 }