fixes

diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 0e091b994134fcce7d3b4d59ffd0504e9712b4f8..912b64ba683e1d90861baf2cc61649f09493af1e 100644 (file)
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -57,7 +57,7 @@ sub dumpvalues ($@) { #{{{
 } #}}}
 
 sub dump ($) { #{{{
 } #}}}
 
 sub dump ($) { #{{{

-       my $file=shift;
+       my $file=IkiWiki::possibly_foolish_untaint(shift);

        
        my %setup=(%config);
        my @ret;
        
        my %setup=(%config);
        my @ret;

diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 271d8d64167cf8e0c6e3e16e8e64977af061a5e3..faf1643587078e1ae69ff421cb5510c2421073de 100644 (file)
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -389,9 +389,10 @@ describing the option. For example:
                                rebuild => 0,
                        },
 
                                rebuild => 0,
                        },
 

-* `type` can be "boolean", "string", "integer", or `undef` (use for complex
-  types). Note that the type is the type of the leaf values; the `%config`
-  option may be an array or hash of these.
+* `type` can be "boolean", "string", "integer", "internal" (used for values
+  that are not user-visible) or `undef` (use for complex types). Note that
+  the type is the type of the leaf values; the `%config` option may be an
+  array or hash of these.

 * `default` should be set to the default value of the option, if any.
 * `example` can be set to an example value, which will not be used by default.
 * `description` is a short description of the option.
 * `default` should be set to the default value of the option, if any.
 * `example` can be set to an example value, which will not be used by default.
 * `description` is a short description of the option.