fix data:image handling

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index f3f7bae5a746d0b6d0ef67b7866a8bcad80aa3f3..87db648e0accc2c177f2f55e8c6dc712863a0326 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) {
                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;
                        checkconfig();
                        if (! $config{cgi} && ! $config{post_commit}) {
                                $config{post_commit}=1;


@@ -45,6 +45,7 @@ sub setup_standard {
        }
        
        foreach my $c (keys %setup) {
        }
        
        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});
                if (defined $setup{$c}) {
                        if (! ref $setup{$c}) {
                                $config{$c}=possibly_foolish_untaint($setup{$c});