diff options
| -rw-r--r-- | IkiWiki/Render.pm | 2 | ||||
| -rw-r--r-- | IkiWiki/Setup/Standard.pm | 15 |
2 files changed, 14 insertions, 3 deletions
diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index f9730193b..9ece00157 100644 --- 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 a13e7805a..9883b922a 100644 --- 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.."); |