reset the session of the survey when deactivating it

LimeSurvey · Dec 10, 2015 · 323bcba · 323bcba
1 parent 0f270a7
commit 323bcba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -340,6 +340,9 @@ public function deactivate($iSurveyID = null)
 
                 $aData['tnewtable'] = $tnewtable;
                 $aData['toldtable'] = $toldtable;
+
+                // Reset the session of the survey when deactivating it
+                killSurveySession($iSurveyID);
             }
 
             //Remove any survey_links to the CPDB

diff --git a/application/helpers/admin/activate_helper.php b/application/helpers/admin/activate_helper.php
@@ -258,9 +258,6 @@ function activateSurvey($iSurveyID, $simulate = false)
     //Check for any additional fields for this survey and create necessary fields (token and datestamp)
     $prow = Survey::model()->findByAttributes(array('sid' => $iSurveyID));
 
-	//reset the session data of the survey if exist
-    unset(Yii::app()->session['survey_'.$iSurveyID]);
-
     //Get list of questions for the base language
     $fieldmap = createFieldMap($iSurveyID,'full',true,false,getBaseLanguageFromSurveyID($iSurveyID));