* Patch from Jordà Polo to make Setup::Standard support hashes in config

files.
master
joey 2006-08-23 18:41:32 +00:00
parent 5085ae1360
commit aa04f54ae9
2 changed files with 8 additions and 1 deletions

View File

@ -55,6 +55,11 @@ sub setup_standard {
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;

4
debian/changelog vendored
View File

@ -14,8 +14,10 @@ ikiwiki (1.22) UNRELEASED; urgency=low
* Use the template plugin to add infoboxes to each plugin page listing basic
info about the plugin.
* Make pagespec merge code smarter about merging duplicate pagespecs.
* Patch from Jordà Polo to make Setup::Standard support hashes in config
files.
-- Joey Hess <joeyh@debian.org> Wed, 23 Aug 2006 02:38:34 -0400
-- Joey Hess <joeyh@debian.org> Wed, 23 Aug 2006 14:35:18 -0400
ikiwiki (1.21) unstable; urgency=low