X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/472dabbb6002219d324ae8480df57d02b6f0ca94..f46c35f46f29f56ffb701e6db8e5dc645162da07:/IkiWiki/Setup/Standard.pm diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 77c164e34..c279e6451 100644 --- 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}) { 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}); 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}); @@ -71,10 +69,10 @@ sub setup_standard { } elsif (! $config{refresh}) { $config{rebuild}=1; - debug("rebuilding wiki.."); + debug(gettext("rebuilding wiki..")); } else { - debug("refreshing wiki.."); + debug(gettext("refreshing wiki..")); } loadplugins(); @@ -83,7 +81,7 @@ sub setup_standard { loadindex(); refresh(); - debug("done"); + debug(gettext("done")); saveindex(); }