join multiple select results by $OFS

[perl/html-form-simple.git] / lib / HTML / Form / Simple.pm

diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 66958c3c294d760d7729474a4ba829de9e3e1b10..5946030fc4d1a7eda47d3e28aed25f50f3defbdf 100644 (file)
--- 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 {