Merge branch 'master' into develop

LimeSurvey · Jul 29, 2022 · 15f85ab · 15f85ab
2 parents ecda93e + 3682d8c
commit 15f85ab
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/application/controllers/SurveyAdministrationController.php b/application/controllers/SurveyAdministrationController.php
@@ -575,7 +575,7 @@ public function actionImportsurveyresources()
         if (!empty($iSurveyID)) {
             if (Yii::app()->getConfig('demoMode')) {
                 Yii::app()->user->setFlash('error', gT("Demo mode only: Uploading files is disabled in this system."));
-                $this->redirect(array('surveyAdministration/editlocalsettings/surveyid/' . $iSurveyID));
+                $this->redirect(array('surveyAdministration/rendersidemenulink/', 'surveyid' => $iSurveyID, 'subaction' => 'generalsettings'));
             }
 
             // Create temporary directory
@@ -595,7 +595,7 @@ public function actionImportsurveyresources()
                     gT("Incorrect permissions in your %s folder."),
                     $basedestdir
                 ));
-                $this->redirect(array('surveyAdministration/editlocalsettings/surveyid/' . $iSurveyID));
+                $this->redirect(array('surveyAdministration/rendersidemenulink/', 'surveyid' => $iSurveyID, 'subaction' => 'generalsettings'));
             }
 
 
@@ -612,7 +612,7 @@ public function actionImportsurveyresources()
                         'error',
                         gT("This file is not a valid ZIP file archive. Import failed. ") . $zip->errorInfo(true)
                     );
-                    $this->redirect(array('surveyAdministration/editlocalsettings/surveyid/' . $iSurveyID));
+                    $this->redirect(array('surveyAdministration/rendersidemenulink/', 'surveyid' => $iSurveyID, 'subaction' => 'generalsettings'));
                 }
                 // now read tempdir and copy authorized files only
                 $folders = array('flash', 'files', 'images');