Dev: Store frontend flash message in state-key frontend{survey id}

LimeSurvey · Apr 1, 2016 · 588129a · 588129a
1 parent 0e795be
commit 588129a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -5435,7 +5435,7 @@ private function _UpdateValuesInDatabase($updatedValues, $finished=false)
                             $message .= $this->gT('Error in SQL update');  // TODO - add  SQL error?
                         }
 
-                        LimeExpressionManager::addFrontendFlashMessage('error', $message);
+                        LimeExpressionManager::addFrontendFlashMessage('error', $message, $this->sid);
 
                     }
                     // Save Timings if needed
@@ -10159,11 +10159,12 @@ public function loadTokenInformation($iSurveyId, $sToken = null, $bAnonymize = f
          *
          * @param string $type Yii type of flash: `error`, `notice`, 'success'
          * @param string $message
+         * @param int $surveyid
          * @return void
          */
-        public static function addFrontendFlashMessage($type, $message) {
+        public static function addFrontendFlashMessage($type, $message, $surveyid) {
             $originalPrefix = Yii::app()->user->getStateKeyPrefix();
-            Yii::app()->user->setStateKeyPrefix('frontend' . $this->sid);
+            Yii::app()->user->setStateKeyPrefix('frontend' . $surveyid);
             Yii::app()->user->setFlash('error', $message);
             Yii::app()->user->setStateKeyPrefix($originalPrefix);
         }

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -822,7 +822,7 @@ function submitfailed($errormsg = '', $query = null)
             }
             else
             {
-                $email .= "$value: N/A (value not set in session)\n";
+                $email .= "$value: N/A\n";
             }
         }
         $email .= "\n".gT("SQL CODE THAT FAILED","unescaped").":\n"