Fixed issue #07025: "Resume later" in Token/Enable token-based respon…

…se persistence don't have to show in forms Dev: still unaccessible without javascript / just take the code from 1.92
LimeSurvey · Dec 7, 2012 · 91333e3 · 91333e3
1 parent 3f6e18f
commit 91333e3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -275,8 +275,10 @@ function run($surveyid,$args) {
             {
                 // must do this here to process the POSTed values
                 $moveResult = LimeExpressionManager::JumpTo($_SESSION[$LEMsessid]['step'], false);   // by jumping to current step, saves data so far
-
-                $cSave->showsaveform(); // generates a form and exits, awaiting input
+                if ($thissurvey['tokenanswerspersistence'] != 'Y' || !isset($surveyid) || !tableExists('tokens_'.$surveyid))
+                {
+                    $cSave->showsaveform(); // generates a form and exits, awaiting input
+                }
             }
 
             if ($thissurvey['active'] == "Y" && isset($_POST['saveprompt']))

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -462,7 +462,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
                 $_saveall = '';
             }
         }
-        elseif (isset(Yii::app()->session['scid']) && (isset($move) && $move == "movelast"))
+        elseif (isset($_SESSION['survey_'.$surveyid]['scid']) && (isset($move) && $move == "movelast"))
         {  //Already saved and on Submit Page, dont show Save So Far button
             $_saveall = '';
         }