Fixed issue #05759: Default date based on token gives incorrect result

Dev defaults need to be set by EM, not by buildsurveysession git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_yii@12362 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Feb 5, 2012 · 3e7fbd2 · 3e7fbd2
1 parent 2e239c8
commit 3e7fbd2
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -2033,14 +2033,15 @@ function buildsurveysession($surveyid,$previewGroup=false)
 
     }
 
-    // Prefill question/answer from defaultvalues
-    foreach ($fieldmap as $field)
-    {
-        if (isset($field['defaultvalue']))
-        {
-            $_SESSION['survey_'.$surveyid][$field['fieldname']]=$field['defaultvalue'];
-        }
-    }
+    // Defaults need to be set within Expression Manager so that it can process defaults comprised of equations
+//    // Prefill question/answer from defaultvalues
+//    foreach ($fieldmap as $field)
+//    {
+//        if (isset($field['defaultvalue']))
+//        {
+//            $_SESSION['survey_'.$surveyid][$field['fieldname']]=$field['defaultvalue'];
+//        }
+//    }
     // Prefill questions/answers from command line params
     if (isset($_SESSION['survey_'.$surveyid]['insertarray']))
     {