deep copy/untaint arrays in setup

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index f9730193b42c26ef3cacfd1eac51cddc73d794be..9ece00157acd0d8c9a8146090648ad68dc0f4c76 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -141,7 +141,7 @@ sub preprocess ($$) { #{{{
                        return $plugins{preprocess}{$command}->(page => $page, %params);
                }
                else {
-                       return "[[bad directive $command]]";
+                       return "[[$command not processed]]";
                }
        };
        

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index a13e7805a1c5b8632651ee1b5b8897dffd336944..9883b922a5514da91ce5d820dfe2da2bca148f06 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -28,11 +28,22 @@ sub setup_standard {
                        gen_wrapper();
                }
                %config=(%startconfig);
+               delete $config{wrappers};
        }
        foreach my $c (keys %setup) {
-               $config{$c}=possibly_foolish_untaint($setup{$c})
-                       if defined $setup{$c} && ! ref $setup{$c};
+               if (defined $setup{$c}) {
+                       if (! ref $setup{$c}) {
+                               $config{$c}=possibly_foolish_untaint($setup{$c});
+                       }
+                       elsif (ref $setup{$c} eq 'ARRAY') {
+                               $config{$c}=[map { possibly_foolish_untaint($_) } @{$setup{$c}}]
+                       }
+               }
+               else {
+                       $config{$c}=undef;
+               }
        }
+
        if (! $config{refresh}) {
                $config{rebuild}=1;
                debug("rebuilding wiki..");