Commit a03ce8ba authored by Oliver Bartsch's avatar Oliver Bartsch Committed by Christian Kuhn
Browse files

[BUGFIX] Return PSR-7 responses in PermissionController

Resolves: #94436
Related: #92784
Releases: master
Change-Id: I98d1a8d08e44ebf3b9626d6ead686059acd95db2
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/69659


Tested-by: core-ci's avatarcore-ci <typo3@b13.com>
Tested-by: Jochen's avatarJochen <rothjochen@gmail.com>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Jochen's avatarJochen <rothjochen@gmail.com>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent edc137cb
......@@ -15,6 +15,7 @@
namespace TYPO3\CMS\Beuser\Controller;
use Psr\Http\Message\ResponseInterface;
use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Tree\View\PageTreeView;
use TYPO3\CMS\Backend\Utility\BackendUtility;
......@@ -188,7 +189,7 @@ class PermissionController extends ActionController
/**
* Index action
*/
public function indexAction()
public function indexAction(): ResponseInterface
{
if (!$this->id) {
$this->pageInfo = ['title' => $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename'], 'uid' => 0, 'pid' => 0];
......@@ -251,12 +252,14 @@ class PermissionController extends ActionController
$this->getLanguageService()->sL('LLL:EXT:beuser/Resources/Private/Language/locallang_mod_permission.xlf:permissions'),
$this->id !== 0 && isset($this->pageInfo['title']) ? $this->pageInfo['title'] : ''
);
return $this->htmlResponse();
}
/**
* Edit action
*/
public function editAction()
public function editAction(): ResponseInterface
{
$this->view->assign('id', $this->id);
$this->view->assign('depth', $this->depth);
......@@ -296,6 +299,8 @@ class PermissionController extends ActionController
$this->view->assign('pageInfo', $this->pageInfo);
$this->view->assign('returnUrl', $this->returnUrl);
$this->view->assign('recursiveSelectOptions', $this->getRecursiveSelectOptions());
return $this->htmlResponse();
}
/**
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment