From a614d4f230c9de73f55b17099ffeb44ae78ec477 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Tue, 12 Oct 2010 10:50:26 -0700 Subject: [PATCH] '' is no longer a special value for Workflow Activities, that will cause them to pull their defaultValue. Instead, only undef will do that. Fixes bug #11900 --- docs/changelog/7.x.x.txt | 1 + lib/WebGUI/Workflow/Activity.pm | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 1902cc242..ee18404ab 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -5,6 +5,7 @@ - fixed #11773: Form injection in the EMS event ordering code. - fixed #11773: SQL injection vulnerability in Edit Thing form processing code. - fixed #11906: Carousel slide height problems + - fixed #11900: Request Approval for Version Tag Workflow activity can't select --Continue with this workflow 7.10.2 - fixed #11884: Editing Templates impossible / Code editor not loaded diff --git a/lib/WebGUI/Workflow/Activity.pm b/lib/WebGUI/Workflow/Activity.pm index 23bfb6ee6..5e3ecc862 100644 --- a/lib/WebGUI/Workflow/Activity.pm +++ b/lib/WebGUI/Workflow/Activity.pm @@ -315,7 +315,7 @@ sub new { my %data = (%{$main}, %{$sub}); for my $definition (reverse @{$class->definition($session)}) { for my $property (keys %{$definition->{properties}}) { - if(!defined $data{$property} || $data{$property} eq '' && $definition->{properties}{$property}{defaultValue}) { + if(!defined $data{$property}) { $data{$property} = $definition->{properties}{$property}{defaultValue}; } }