Merge remote-tracking branch 'origin/master' into cint

LimeSurvey · Aug 8, 2016 · 5e9355f · 5e9355f
2 parents 407eb5a + 457cdba
commit 5e9355f
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
@@ -676,11 +676,13 @@ public function activate($iSurveyID)
         $aData['surveyid'] = $iSurveyID;
         $surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
         $aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
-        // Die if this is not possible
+        // Redirect if this is not possible
         if (!isset($aData['aSurveysettings']['active']) || $aData['aSurveysettings']['active'] == 'Y')
-            $this->getController()->error('Survey not active');
+        {
+            Yii::app()->setFlashMessage(gT("This survey is already active."),'error');
+            $this->getController()->redirect(array('admin/survey','sa'=>'view','surveyid'=>$iSurveyID));
 
-        $qtypes = getQuestionTypeList('', 'array');
+        }        $qtypes = getQuestionTypeList('', 'array');
         Yii::app()->loadHelper("admin/activate");
 
         if (Yii::app()->request->getPost('ok')=='')