X-Git-Url: http://git.shiar.net/perl/html-form-simple.git/blobdiff_plain/80de26e2b6b53f54ffb5232472e56c3225a101e1..6bef855dc6c753640512d512e5b31e2734484382:/lib/HTML/Form/Simple.pm

diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 66958c3..5946030 100644
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -108,6 +108,8 @@ sub select {
 
 	my @options = map { ref $_ ? $_ : {value => $_} } @$rows;
 
+	my @return;
+
 	if ($attr->{type} eq 'select') {
 		delete $attr->{type};
 		if (defined $default) {
@@ -115,17 +117,17 @@ sub select {
 				$_->{selected} = 1 if defined $_->{value} and $_->{value} eq $default;
 			}
 		}
-		my @return = (
+		@return = (
 			$self->tag(select => $attr),
 			(map { $self->tag(option => $_) } @options),
 			'</select>',
 		);
-		return wantarray ? @return : join('', @return);
 	}
 	else {
 		if (defined $attr->{id} and $attr->{id} ne '') {
-			defined $_->{id} or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
-				for @options;
+			defined $_->{id}
+				or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
+					for @options;
 		}
 		if (defined $attr->{label}) {
 			defined $_->{value} and not defined $_->{label}
@@ -139,14 +141,15 @@ sub select {
 			}
 		}
 		$_ = {%$attr, %$_} for @options;
-		my @return = map {
+		@return = map {
 			my $label = delete $_->{label};
 			defined $label && $label ne ''
 				? '<label>'.$self->tag(input => $_)." $label</label>"
 				:           $self->tag(input => $_)
 		} @options;
-		return wantarray ? @return : join('', @return);
 	}
+
+	return wantarray ? @return : join(defined $, ? $, : '', @return);
 }
 
 sub radio {