Macro's not handled properly

This commit is contained in:
Len Kranendonk 2004-07-28 06:19:20 +00:00
parent 006014bfde
commit c66b30eb11

View file

@ -297,6 +297,9 @@ sub getWobjectByCriteria {
my $namespace = $wobjectProxy->{proxiedNamespace}; my $namespace = $wobjectProxy->{proxiedNamespace};
my $wobjectId = $wobjectProxy->{wobjectId}; my $wobjectId = $wobjectProxy->{wobjectId};
# Parse macro's in criteria
$criteria = WebGUI::Macro::process($criteria);
# Once a wobject is found, we will stick to that wobject, # Once a wobject is found, we will stick to that wobject,
# to prevent the proxying of multiple- depth wobjects like Surveys and USS. # to prevent the proxying of multiple- depth wobjects like Surveys and USS.
my $scratchId; my $scratchId;
@ -332,10 +335,10 @@ sub getWobjectByCriteria {
# quote the field / value variables. # quote the field / value variables.
my $quotedField = $field; my $quotedField = $field;
my $quotedValue = $value;
unless ($field =~ /^\s*['"].*['"]\s*/) { unless ($field =~ /^\s*['"].*['"]\s*/) {
$quotedField = quote($field); $quotedField = quote($field);
} }
my $quotedValue = WebGUI::Macro::process($value);
unless ($value =~ /^\s*['"].*['"]\s*/) { unless ($value =~ /^\s*['"].*['"]\s*/) {
$quotedValue = quote($value); $quotedValue = quote($value);
} }