Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f3f7bae5a746d0b6d0ef67b7866a8bcad80aa3f3..0a34968855a2cd26ac4609d27b73b2d0e440ea76 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -34,7 +34,7 @@ sub setup_standard {
                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;
@@ -45,6 +45,7 @@ sub setup_standard {
        }
        
        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});
@@ -62,20 +63,25 @@ 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;
+
+       if (! $config{refresh}) {
                debug(gettext("rebuilding wiki.."));
        }
        else {
                debug(gettext("refreshing wiki.."));
        }
 
-       loadplugins();
-       checkconfig();
        lockwiki();
        loadindex();
        refresh();