web commit from 217.112.243.2: poll vote

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

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index b76c87b8e9ccf4b17c83c8e32dd88821e98016d6..7512c258758eb7e7a577d73e08b2679dc5a6e6b0 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -34,7 +34,7 @@ sub setup_standard {
                $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
        }
 
                $config{wiki_file_prune_regexp}=qr/$config{wiki_file_prune_regexp}|$setup{exclude}/;
        }
 

-       if (! $config{refresh} || $config{wrappers}) {
+       if (! $config{render} && (! $config{refresh} || $config{wrappers})) {

                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};
                debug("generating wrappers..");
                my @wrappers=@{$setup{wrappers}};
                delete $setup{wrappers};


@@ -55,13 +55,21 @@ sub setup_standard {
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
                        }
                        elsif (ref $setup{$c} eq 'ARRAY') {
                                $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
                        }

+                       elsif (ref $setup{$c} eq 'HASH') {
+                               foreach my $key (keys %{$setup{$c}}) {
+                                       $config{$c}{$key}=possibly_foolish_untaint($setup{$c}{$key});
+                               }
+                       }

                }
                else {
                        $config{$c}=undef;
                }
        }
 
                }
                else {
                        $config{$c}=undef;
                }
        }
 

-       if (! $config{refresh}) {
+       if ($config{render}) {
+               commandline_render();
+       }
+       elsif (! $config{refresh}) {

                $config{rebuild}=1;
                debug("rebuilding wiki..");
        }
                $config{rebuild}=1;
                debug("rebuilding wiki..");
        }