Fixed issue #6686: "Restart this survey" link is incorrect

LimeSurvey · Oct 12, 2012 · edb5f1a · edb5f1a
1 parent 8861127
commit edb5f1a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/application/helpers/SurveyRuntimeHelper.php b/application/helpers/SurveyRuntimeHelper.php
@@ -358,7 +358,7 @@ function run($surveyid,$args) {
                 //field for limereplace stuff, and do transformations!
                 $thissurvey['surveyls_url'] = passthruReplace($thissurvey['surveyls_url'], $thissurvey);
                 $thissurvey['surveyls_url'] = templatereplace($thissurvey['surveyls_url'],array('SID'=>$thissurvey['sid'],
-                                                                                                'SAVEDID'=>$_SESSION[$LEMsessid]['srid'],
+                                                                                                'SAVEDID'=>(isset($_SESSION[$LEMsessid]['srid']) ? $_SESSION[$LEMsessid]['srid'] : ''),
                                                                                                 'TOKEN'=>(isset($clienttoken) ? $clienttoken : ''),
                                                                                                 ));   // to do INSERTANS substitutions
 

diff --git a/application/helpers/replacements_helper.php b/application/helpers/replacements_helper.php
@@ -412,7 +412,7 @@ function templatereplace($line, $replacements = array(), &$redata = array(), $de
 
         if (returnGlobal('token'))
         {
-            $_clearall .= "&amp;token=" . urlencode(trim(sanitize_token(strip_tags(returnGlobal('token')))));
+            $_clearall .= "?token=" . urlencode(trim(sanitize_token(strip_tags(returnGlobal('token')))));
         }
         $_clearall .= "', '_self')}\" />";
     }