From 314da5621e0355576c60e12e27e617c34bd8265f Mon Sep 17 00:00:00 2001 From: Graham Knop Date: Wed, 3 Dec 2008 00:32:30 +0000 Subject: [PATCH] FormValidator doesn't need to handle defaults, the Forms API already does that --- lib/WebGUI/FormValidator.pm | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/lib/WebGUI/FormValidator.pm b/lib/WebGUI/FormValidator.pm index d34b1da03..b411808d8 100644 --- a/lib/WebGUI/FormValidator.pm +++ b/lib/WebGUI/FormValidator.pm @@ -162,22 +162,14 @@ sub process { my ($name, $type, $default, $params) = @$args{qw( name type default params )}; $params->{name} = $name; - if (wantarray) { + $params->{defaultValue} = $default + unless defined $params->{defaultValue}; + if (wantarray) { my @values = $self->$type($params); - if (scalar(@values) < 1 && ref $default eq "ARRAY") { - return @{$default}; - } else { - return @values; - } + return @values; } else { my $value = $self->$type($params); - unless (defined $value) { - return $default; - } - if ($value =~ /^[\s]+$/) { - return undef; - } - return $value; + return $value; } }