Fixed issue #10724: Date Question Default value inconsistent behavior…

… w/ token persistence enabled
LimeSurvey · May 24, 2016 · 749d240 · 749d240
1 parent 71b97a9
commit 749d240
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -125,6 +125,7 @@ function loadanswers()
                 //Only make session variables for those in insertarray[]
                 if (in_array($column, $_SESSION['survey_'.$surveyid]['insertarray']) && isset($_SESSION['survey_'.$surveyid]['fieldmap'][$column]))
                 {
+
                     if (($_SESSION['survey_'.$surveyid]['fieldmap'][$column]['type'] == 'N' ||
                     $_SESSION['survey_'.$surveyid]['fieldmap'][$column]['type'] == 'K' ||
                     $_SESSION['survey_'.$surveyid]['fieldmap'][$column]['type'] == 'D') && $value == null)
@@ -139,6 +140,10 @@ function loadanswers()
                     {
                         $_SESSION['survey_'.$surveyid][$column]=$value;
                     }
+                    if(isset($token) && !empty($token))
+                    {
+                        $_SESSION['survey_'.$surveyid][$column]=$value;
+                    }
                 }  // if (in_array(
             }  // else
         } // foreach