From: Joey Hess <joey@kodama.kitenet.net>
Date: Sun, 3 Aug 2008 18:39:34 +0000 (-0400)
Subject: properly support all types of data in arrays
X-Git-Tag: 2.60~104
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=d00f3edf13ae77aa52cf6f7cd335f6e531cda3c0;p=ikiwiki.git

properly support all types of data in arrays
---

diff --git a/IkiWiki/Plugin/websetup.pm b/IkiWiki/Plugin/websetup.pm
index 8ef336b03..d087b4863 100644
--- a/IkiWiki/Plugin/websetup.pm
+++ b/IkiWiki/Plugin/websetup.pm
@@ -111,21 +111,14 @@ sub showfields ($$$@) { #{{{
 		}
 
 		my $value=$config{$key};
+		if (ref $config{$key} eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
+			push @{$value}, "", ""; # blank items for expansion
+		}
+
 		# multiple plugins can have the same field
 		my $name=defined $plugin ? $plugin.".".$key : $key;
 
-		if (ref $config{$key} eq 'ARRAY' || ref $info{example} eq 'ARRAY') {
-			$form->field(
-				name => $name,
-				label => $description,
-				comment => formatexample($info{example}, $value),
-				type => "text",
-				value => [ref $value eq 'ARRAY' ? @{$value} : "", , "", ""],
-				size => 60,
-				fieldset => $section,
-			);
-		}
-		elsif ($info{type} eq "string") {
+		if ($info{type} eq "string") {
 			$form->field(
 				name => $name,
 				label => $description,