Fixed issue: Accidental double deactivation throws database error

LimeSurvey · Sep 22, 2020 · a58ef3a · a58ef3a
1 parent dec1f30
commit a58ef3a
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -742,11 +742,11 @@ public function deactivate($iSurveyID = null)
             return;
         }
 
+        if (!tableExists('survey_'.$iSurveyID)) {
+            $_SESSION['flashmessage'] = gT("Error: Response table does not exist. Survey cannot be deactivated.");
+            $this->getController()->redirect($this->getController()->createUrl("admin/survey/sa/view/surveyid/{$iSurveyID}"));
+        }
         if (Yii::app()->request->getPost('ok') == '') {
-            if (!tableExists('survey_'.$iSurveyID)) {
-                $_SESSION['flashmessage'] = gT("Error: Response table does not exist. Survey cannot be deactivated.");
-                $this->getController()->redirect($this->getController()->createUrl("admin/survey/sa/view/surveyid/{$iSurveyID}"));
-            }
             $aData['surveyid'] = $iSurveyID;
             $aData['date']     = $date;
             $aData['dbprefix'] = Yii::app()->db->tablePrefix;