Fixes to make WebGUI compatible with newer perls.

This commit is contained in:
Colin Kuskie 2012-06-29 13:24:13 -07:00
parent 0422807b32
commit dc4f813a5f

View file

@ -1399,7 +1399,7 @@ sub view {
my $responseDetails = $self->getResponseDetails || {}; my $responseDetails = $self->getResponseDetails || {};
# Add lastResponse template vars # Add lastResponse template vars
for my $tv qw(endDate complete restart timeout timeoutRestart) { for my $tv ( qw(endDate complete restart timeout timeoutRestart) ) {
$var->{"lastResponse\u$tv"} = $responseDetails->{$tv}; $var->{"lastResponse\u$tv"} = $responseDetails->{$tv};
} }
$var->{lastResponseFeedback} = $responseDetails->{templateText}; $var->{lastResponseFeedback} = $responseDetails->{templateText};
@ -2185,7 +2185,7 @@ sub takenCount {
my $sql = 'select count(*) from Survey_response where'; my $sql = 'select count(*) from Survey_response where';
$sql .= ' assetId = ' . $self->session->db->quote($self->getId); $sql .= ' assetId = ' . $self->session->db->quote($self->getId);
$sql .= ' and isComplete = ' . $self->session->db->quote($isComplete); $sql .= ' and isComplete = ' . $self->session->db->quote($isComplete);
for my $o qw(userId ipAddress) { for my $o ( qw(userId ipAddress) ) {
if (my $o_value = $opts{$o}) { if (my $o_value = $opts{$o}) {
$sql .= " and $o = " . $self->session->db->quote($o_value); $sql .= " and $o = " . $self->session->db->quote($o_value);
} }