oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "One-line fix for Survey ExpressionEngine bug that took over a day to find."

Browse source 
This reverts commit bcd99945ca.
This commit is contained in:
Patrick Donelan 2009-11-05 22:37:50 -05:00
parent bcd99945ca
commit 5899fa4289
3 changed files with 4 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/WebGUI/Asset/Wobject/Survey/ExpressionEngine.pm
View file

@ -24,10 +24,8 @@ use WebGUI::Asset;
use WebGUI::Asset::Wobject::Survey;
Params::Validate::validation_options( on_fail => sub { WebGUI::Error::InvalidParam->throw( error => shift ) } );
# We need these as file-scoped lexicals so that our utility subs (which are shared with the safe compartment)
# We need these as semi-globals so that utility subs (which are shared with the safe compartment)
# can access them.
# N.B. If you add any new ones, make sure you initialize them in L<run> otherwise they will be cached across
# unrelated engine runs, which leads to bugs that are hairy to track down
my $session;
my $values;
my $scores;
@ -433,7 +431,7 @@ sub run {
my ( $s, $expression, $opts )
= validate_pos( @_, { isa => 'WebGUI::Session' }, { type => SCALAR }, { type => HASHREF, default => {} } );
# Initialize all file-scoped lexicals that our Safe utility subs have access to
# Init package globals
$session = $s;
$values = $opts->{values} || {};
$scores = $opts->{scores} || {};
@ -441,7 +439,6 @@ sub run {
$validate = $opts->{validate};
$validTargets = $opts->{validTargets};
$tags = $opts->{tags} || {};
$otherInstances = {};
if ( !$session->config->get('enableSurveyExpressionEngine') ) {
$session->log->debug('enableSurveyExpressionEngine config option disabled, skipping');