Merge branch 'master' of gitlab.sgalinski.de:typo3/sg_mail

Classes/Service/BackendService.php

@@ -158,7 +158,6 @@ class BackendService {
 			->setSetVariables([]);
 
 		$buttonBar->addButton($shortcutButton, ButtonBar::BUTTON_POSITION_RIGHT);
-		$docHeaderComponent->getButtonBar();
 	}
 
 	/**

Classes/ViewHelpers/Be/Menus/ActionMenuItemViewHelper.php

@@ -87,20 +87,12 @@ class ActionMenuItemViewHelper extends AbstractTagBasedViewHelper {
 		);
 		if (
 			$this->arguments['selected'] ||
-			array_diff($requestArguments, $viewHelperArguments) === [] ||
-			$this->tag->hasAttribute('selected')
+			array_diff($requestArguments, $viewHelperArguments) === []
 		) {
 			$this->tag->addAttribute('selected', 'selected');
 		} else {
 			$this->tag->removeAttribute('selected');
 		}
-
-		if ($arguments['parameters']['selected'] === 'selected') {
-			$this->tag->addAttribute('selected', 'selected');
-		} elseif ($arguments['parameters']['selected'] === '') {
-			$this->tag->removeAttribute('selected');
-		}
-
 		$this->tag->setContent($label);
 
 		return $this->tag->render();

Classes/ViewHelpers/Widget/UriViewHelper.php

@@ -116,10 +116,16 @@ class UriViewHelper extends AbstractViewHelper {
 		$argumentPrefix = $controllerContext->getRequest()->getArgumentPrefix();
 		$parentNamespace = $controllerContext->getRequest()->getWidgetContext()->getParentPluginNamespace();
 		$parentArguments = GeneralUtility::_GP($parentNamespace);
-		$allArguments = [$argumentPrefix => $arguments];
+		$allArguments = [$argumentPrefix => $arguments['arguments'] ?? []];
 		if ($parentArguments && isset($parentArguments['filters'])) {
 			$allArguments[$parentNamespace . '[filters]'] = $parentArguments['filters'];
 		}
+		if ($arguments['action'] ?? FALSE) {
+			$allArguments[$argumentPrefix]['action'] = $arguments['action'];
+		}
+		if (($arguments['format'] ?? '') !== '') {
+			$allArguments[$argumentPrefix]['format'] = $arguments['format'];
+		}
 		return $uriBuilder->reset()
 			->setArguments($allArguments)
 			->setSection($arguments['section'])

composer.json

@@ -6,7 +6,7 @@
     "license": [
         "GPL-2.0-or-later"
     ],
-    "version": "5.2.4",
+    "version": "5.2.5",
     "repositories": [
         {
             "type": "composer",

ext_emconf.php

@@ -8,7 +8,7 @@ $EM_CONF['sg_mail'] = [
 	'title' => 'Mail Templates',
 	'description' => 'Mail Templates',
 	'category' => 'module',
-	'version' => '5.2.4',
+	'version' => '5.2.5',
 	'state' => 'stable',
 	'uploadfolder' => FALSE,
 	'createDirs' => '',