Dev: move beforeSurveyPage just before renderExistMessage part

Dev: but after newtest=Y action
LimeSurvey · Jun 18, 2018 · b3f2b7d · b3f2b7d
1 parent 1fcf633
commit b3f2b7d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/application/controllers/survey/index.php b/application/controllers/survey/index.php
@@ -58,11 +58,6 @@ public function action()
         $loadpass = $param['loadpass'];
         $sitename = Yii::app()->getConfig('sitename');
 
-        /* Launch beforeSurveyPage before all public action done */
-        $beforeSurveyPageEvent = new PluginEvent('beforeSurveyPage');
-        $beforeSurveyPageEvent->set('surveyId', $surveyid);
-        App()->getPluginManager()->dispatchEvent($beforeSurveyPageEvent);
-
         if (isset($param['newtest']) && $param['newtest'] == "Y") {
             killSurveySession($surveyid);
         }
@@ -95,6 +90,11 @@ public function action()
             SetSurveyLanguage($surveyid, $sDisplayLanguage);
         }
 
+        /* Launch beforeSurveyPage before all renderExitMessage */
+        $beforeSurveyPageEvent = new PluginEvent('beforeSurveyPage');
+        $beforeSurveyPageEvent->set('surveyId', $surveyid);
+        App()->getPluginManager()->dispatchEvent($beforeSurveyPageEvent);
+
         if ($this->_isClientTokenDifferentFromSessionToken($clienttoken, $surveyid)) {
             $sReloadUrl = $this->getController()->createUrl("/survey/index/sid/{$surveyid}", array('token'=>$clienttoken, 'lang'=>App()->language, 'newtest'=>'Y'));
             $aErrors    = array(gT('Token mismatch'));