diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-23 18:41:32 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-08-23 18:41:32 +0000 |
| commit | aa04f54ae94461e6e6ef42596824247c9e04ca5f (patch) | |
| tree | b5abc9ee0fcdd9f15f927f76836ff4534ccdb255 | |
| parent | 5085ae1360c30c163fef4de94dcc65fef9f5ef17 (diff) | |
* Patch from Jordà Polo to make Setup::Standard support hashes in config
files.
| -rw-r--r-- | IkiWiki/Setup/Standard.pm | 5 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index b76c87b8e..b7583097d 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -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; diff --git a/debian/changelog b/debian/changelog index 4f7342cde..0d0b74d05 100644 --- a/debian/changelog +++ b/debian/changelog @@ -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 |