From ca4933b9785d7cdda6e6a82dac1b29cdb9b3fc39 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Fri, 14 Oct 2011 05:43:21 +0000 Subject: [PATCH] Dev All-in-one and Group-at-a-time survey modes are now displaying properly. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11160 b72ed6b6-b9f8-46b5-92b4-906544132732 --- application/helpers/expressions/em_manager_helper.php | 2 +- application/libraries/Survey_format.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php index b03db0bd5c4..621dbb3784d 100644 --- a/application/helpers/expressions/em_manager_helper.php +++ b/application/helpers/expressions/em_manager_helper.php @@ -1040,7 +1040,7 @@ static function FinishProcessingPage() $totalTime += $unit[1]; } log_message('debug','Total time attributable to EM = ' . $totalTime); - log_message('debug',print_r($LEM->runtimeTimings,true)); +// log_message('debug',print_r($LEM->runtimeTimings,true)); } static function ShowLogicFile() diff --git a/application/libraries/Survey_format.php b/application/libraries/Survey_format.php index 673efec1cbd..aaafdce24c0 100644 --- a/application/libraries/Survey_format.php +++ b/application/libraries/Survey_format.php @@ -288,7 +288,7 @@ function run($args) { $qidattributes=getQuestionAttributeValues($ia[0]); $hidden = (isset($qidattributes['hidden']) ? $qidattributes['hidden'] : 0); - LimeExpressionManager::ProcessRelevance($qidattributes['relevance'],$ia[0],$ia[2],$ia[4],$hidden); +// LimeExpressionManager::ProcessRelevance($qidattributes['relevance'],$ia[0],$ia[2],$ia[4],$hidden); // TODO - double check this about expressions - should it continue? if ($ia[4] != '*' && ($qidattributes===false || $qidattributes['hidden']==1)) { continue;