Fixed issue #8107: Poor error message when user loads previously save…

…d survey
LimeSurvey · Oct 19, 2013 · a5e11ee · a5e11ee
1 parent a1672a7
commit a5e11ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -419,8 +419,13 @@ function sendreq(surveyid)
             $_SESSION['survey_'.$surveyid]['holdname'] = $param['loadname']; //Session variable used to load answers every page.
             $_SESSION['survey_'.$surveyid]['holdpass'] = $param['loadpass']; //Session variable used to load answers every page.
 
-            if ($errormsg == "") loadanswers();
-            $move = "movenext";
+            if ($errormsg == "") {
+                if (loadanswers()){
+                    $move = "movenext";
+                } else {
+                    $errormsg .= $clang->gT("There is no matching saved survey");
+                }
+            }
 
             if ($errormsg)
             {

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -52,7 +52,6 @@ function loadanswers()
         $aRow = Yii::app()->db->createCommand($query)->queryRow();
         if (!$aRow)
         {
-            safeDie($clang->gT("There is no matching saved survey")."<br />\n");
             return false;
         }
         else