summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-07-26 13:10:52 -0400
committerJoey Hess <joey@kodama.kitenet.net>2008-07-26 13:10:52 -0400
commit6b19afb3ef4f27516db25da52869280be3e02c14 (patch)
tree915042f603b76bbe4a31d88998a83af48300c0dd
parent9169c3247ffae04ae2fbc9ceda4176ffb5f263d3 (diff)
fixes
-rw-r--r--IkiWiki/Setup/Standard.pm2
-rw-r--r--doc/plugins/write.mdwn7
2 files changed, 5 insertions, 4 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm
index 0e091b994..912b64ba6 100644
--- a/IkiWiki/Setup/Standard.pm
+++ b/IkiWiki/Setup/Standard.pm
@@ -57,7 +57,7 @@ sub dumpvalues ($@) { #{{{
} #}}}
sub dump ($) { #{{{
- my $file=shift;
+ my $file=IkiWiki::possibly_foolish_untaint(shift);
my %setup=(%config);
my @ret;
diff --git a/doc/plugins/write.mdwn b/doc/plugins/write.mdwn
index 271d8d641..faf164358 100644
--- a/doc/plugins/write.mdwn
+++ b/doc/plugins/write.mdwn
@@ -389,9 +389,10 @@ describing the option. For example:
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.