From 066e8ad7c6ce7489bdd084913584a76cf2150f5a Mon Sep 17 00:00:00 2001
From: Andreas Fernandez <a.fernandez@scripting-base.de>
Date: Tue, 21 Nov 2017 08:10:55 +0100
Subject: [PATCH] [BUGFIX] Fix thrown \InvalidArgumentException in access
module
The returnUrl is not available if the access module is accessed via
context menu of the page tree. The module now checks whether the
returnUrl is available and renders the close button only in such case.
Resolves: #83053
Releases: master, 8.7
Change-Id: I37c5c65c1505b42acf7ac734fbc7a9f53629a6a1
Reviewed-on: https://review.typo3.org/54713
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer <georg.ringer@gmail.com>
Tested-by: Riccardo De Contardi <erredeco@gmail.com>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
---
.../Controller/PermissionController.php | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/typo3/sysext/beuser/Classes/Controller/PermissionController.php b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
index 101c9bee217d..c9c0ee9b8347 100644
--- a/typo3/sysext/beuser/Classes/Controller/PermissionController.php
+++ b/typo3/sysext/beuser/Classes/Controller/PermissionController.php
@@ -163,14 +163,16 @@ class PermissionController extends ActionController
if ($currentRequest->getControllerActionName() === 'edit') {
// CLOSE button:
- $closeButton = $buttonBar->makeLinkButton()
- ->setHref($this->returnUrl)
- ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
- ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon(
- 'actions-close',
- Icon::SIZE_SMALL
- ));
- $buttonBar->addButton($closeButton);
+ if (!empty($this->returnUrl)) {
+ $closeButton = $buttonBar->makeLinkButton()
+ ->setHref($this->returnUrl)
+ ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:rm.closeDoc'))
+ ->setIcon($this->view->getModuleTemplate()->getIconFactory()->getIcon(
+ 'actions-close',
+ Icon::SIZE_SMALL
+ ));
+ $buttonBar->addButton($closeButton);
+ }
// SAVE button:
$saveButton = $buttonBar->makeInputButton()
--
GitLab