diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2008-12-31 00:44:54 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2008-12-31 00:44:54 -0500 |
| commit | 3e8b7a6b196767d2c7d21790b6ed7c3fb5f70d31 (patch) | |
| tree | 82ebef7ab97a9e9f7f614fa2d2847fdd413c925e | |
| parent | 0daa4eb521a32b9ed00e99a2155416a312d478de (diff) | |
| download | ikiwiki-3e8b7a6b196767d2c7d21790b6ed7c3fb5f70d31.tar ikiwiki-3e8b7a6b196767d2c7d21790b6ed7c3fb5f70d31.tar.gz | |
websetup: Avoid a crash when a new array setup item has been added in a new ikiwiki release, and is thus not present in the setup file yet.
This happened with camelcase_ignore. The code tried to convert the undef
value for it into an array.
| -rw-r--r-- | IkiWiki/Plugin/websetup.pm | 5 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm index 2d978c5b4..95d044c08 100644 --- a/IkiWiki/Plugin/websetup.pm +++ b/IkiWiki/Plugin/websetup.pm @@ -138,9 +138,8 @@ sub showfields ($$$@) { my $value=$config{$key}; - if ($info{safe} && defined $value && - (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { - $value=[@{$value}, "", ""]; # blank items for expansion + if ($info{safe} && (ref $value eq 'ARRAY' || ref $info{example} eq 'ARRAY')) { + $value=[(ref $value eq 'ARRAY' ? @{$value} : ""), "", ""]; # blank items for expansion } if ($info{type} eq "string") { diff --git a/debian/changelog b/debian/changelog index 13ceb875f..51c9617f7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,8 @@ ikiwiki (3.00) UNRELEASED; urgency=low * htmlbalance: Demand-load HTML::TreeBuilder to avoid failing test suite if it is not present. * French translation update from Philippe Batailler. Closes: #510216 + * websetup: Avoid a crash when a new array setup item has been added in + a new ikiwiki release, and is thus not present in the setup file yet. -- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:36 -0500 |