Merge branch 'master' into develop

LimeSurvey · Oct 5, 2021 · ad43fed · ad43fed
2 parents bb3bb61 + 22efd40
commit ad43fed
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/application/controllers/admin/globalsettings.php b/application/controllers/admin/globalsettings.php
@@ -524,7 +524,7 @@ public function surveySettings()
                 'form' => 'survey-settings-form',
             ],
             'white_closebutton' => [
-                'url' => 'admin/index',
+                'url' => $this->getController()->createUrl('admin/index'),
             ],
         ];
 

diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -266,13 +266,8 @@ public function deleteToken()
         if (!Permission::model()->hasSurveyPermission($iSid, 'tokens', 'delete')) {
             throw new CHttpException(403, gT("You do not have permission to access this page."));
         }
-        if (!Yii::app()->getRequest()->isPostRequest) {
-            TokenDynamic::model($iSid)->deleteToken((int)$aTokenId); //in this case it's no an array ...
-            App()->setFlashMessage(gT('Participant has been deleted.'), 'success');
-            $this->getController()->redirect(array("admin/tokens", "sa" => "browse", "surveyid" => $iSid));
-        }
         TokenDynamic::model($iSid)->deleteRecords(array($aTokenId));
-        return true;
+        $this->getController()->redirect(array("admin/tokens", "sa" => "browse", "surveyid" => $iSid));
     }
 
     /**