diff --git a/lib/WebGUI/ProfileField.pm b/lib/WebGUI/ProfileField.pm index 6961bdd4c..de8fbf2fe 100644 --- a/lib/WebGUI/ProfileField.pm +++ b/lib/WebGUI/ProfileField.pm @@ -117,24 +117,24 @@ Optionally pass in a list of properties to override the default properties of an sub formField { my $self = shift; my $properties = shift; - $properties->{label} = $self->getLabel; - $properties->{fieldType} = $self->get("fieldType"); + $properties->{label} = $self->getLabel; + $properties->{fieldType} = $self->get("fieldType"); $properties->{name} = $self->getId; - my $values = WebGUI::Operation::Shared::secureEval($self->get("possibleValues")); - my $orderedValues = {}; - tie %{$orderedValues}, 'Tie::IxHash'; - foreach my $ov (sort keys %{$values}) { - $orderedValues->{$ov} = $values->{$ov}; - } + my $values = WebGUI::Operation::Shared::secureEval($self->get("possibleValues")); + my $orderedValues = {}; + tie %{$orderedValues}, 'Tie::IxHash'; + foreach my $ov (sort keys %{$values}) { + $orderedValues->{$ov} = $values->{$ov}; + } $properties->{options} = $orderedValues; - my $default; - if ($session{form}{$data->{fieldName}}) { - $default = $session{form}{$data->{fieldName}}; - } elsif ($session{user}{$data->{fieldName}}) { - $default = $session{user}{$data->{fieldName}}; - } else { - $default = WebGUI::Operation::Shared::secureEval($data->{dataDefault}); - } + my $default; + if ($session{form}{$properties->{fieldName}}) { + $default = $session{form}{$properties->{fieldName}}; + } elsif ($session{user}{$properties->{fieldName}}) { + $default = $session{user}{$properties->{fieldName}}; + } else { + $default = WebGUI::Operation::Shared::secureEval($properties->{dataDefault}); + } $properties->{value} = $default; return WebGUI::Form::DynamicField->new($properties)->displayForm; }