X-Git-Url: http://git.shiar.net/perl/html-form-simple.git/blobdiff_plain/b01a7f21ade2de12b620970a9e7ae78cbabd95da..d5415f8292000c0eba35458ce61500eaff9cd4d1:/lib/HTML/Form/Simple.pm

diff --git a/lib/HTML/Form/Simple.pm b/lib/HTML/Form/Simple.pm
index 2c8ce8d..6fb9080 100644
--- a/lib/HTML/Form/Simple.pm
+++ b/lib/HTML/Form/Simple.pm
@@ -122,7 +122,7 @@ sub select {
 		return wantarray ? @return : join('', @return);
 	}
 	else {
-		if (defined $attr->{id}) {
+		if (defined $attr->{id} and $attr->{id} ne '') {
 			defined $_->{id} or defined $_->{value} and $_->{id} = $attr->{id}.'_'.$_->{value}
 				for @options;
 		}
@@ -150,9 +150,26 @@ sub select {
 
 sub radio {
 	my $self = shift;
-	my ($name, $value, $attr) = $self->_attr(2, @_);
+	my ($name, $label, $value, $attr) = $self->_attr(3, @_);
+
+	if (not defined $value) {
+		if (defined $label) {
+			$value = ref $label eq 'ARRAY' ? [1 .. $#$label+1] : [1];
+		}
+		else {
+			$value = [{}];
+		}
+	}
+	elsif (ref $value ne 'ARRAY') {
+		$value = [$value];
+	}
+
+	if (defined $label) {
+		$_ = ref $_ eq 'HASH' ? {%$_} : {value => $_} for @$value;
+		$_->{label} = ref $label eq 'ARRAY' ? shift @$label : $label for @$value;
+	}
 
-	$self->select($name, [$value], {%$attr, type => 'radio'});
+	$self->select($name, $value, {%$attr, type => 'radio'});
 }
 
 sub check {