From 945f3586857b2d6b4e29381ea59e9c252723d4af Mon Sep 17 00:00:00 2001
From: Susanne Moog <susanne.moog@typo3.com>
Date: Thu, 30 Nov 2017 13:47:58 +0100
Subject: [PATCH] [BUGFIX] Fix exceptions from BE Routing change
Change-Id: I3f74892da6c82a7213b7f77d5027160ee118eabb
Resolves: #83174
Releases: master
Reviewed-on: https://review.typo3.org/54886
Reviewed-by: Sebastian Hofer <sebastian.hofer@marit.ag>
Tested-by: Sebastian Hofer <sebastian.hofer@marit.ag>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Benni Mack <benni@typo3.org>
Tested-by: Benni Mack <benni@typo3.org>
---
.../backend/Classes/Controller/EditDocumentController.php | 2 +-
typo3/sysext/backend/Classes/Controller/NewRecordController.php | 2 ++
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index c19f49302aec..27f710068e69 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -1290,7 +1290,7 @@ class EditDocumentController
) {
// TODO: Use the page's pid instead of 0, this requires a clean API to manipulate the page
// tree from the outside to be able to mark the pid as active
- $returnUrl = (string)$uriBuilder->buildUriFromRoute($queryParams['route'], ['id' => 0]);
+ $returnUrl = (string)$uriBuilder->buildUriFromRoutePath($queryParams['route'], ['id' => 0]);
}
}
$deleteButton = $buttonBar->makeLinkButton()
diff --git a/typo3/sysext/backend/Classes/Controller/NewRecordController.php b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
index 95f04613b591..0afe4c42a29d 100644
--- a/typo3/sysext/backend/Classes/Controller/NewRecordController.php
+++ b/typo3/sysext/backend/Classes/Controller/NewRecordController.php
@@ -16,6 +16,7 @@ namespace TYPO3\CMS\Backend\Controller;
use Psr\Http\Message\ResponseInterface;
use Psr\Http\Message\ServerRequestInterface;
+use TYPO3\CMS\Backend\Routing\UriBuilder;
use TYPO3\CMS\Backend\Template\Components\ButtonBar;
use TYPO3\CMS\Backend\Template\ModuleTemplate;
use TYPO3\CMS\Backend\Tree\View\NewRecordPageTreeView;
@@ -690,6 +691,7 @@ class NewRecordController
} elseif ($table === 'pages') {
$urlParameters['overrideVals']['pages']['doktype'] = (int)$this->pageinfo['doktype'];
}
+ $uriBuilder = GeneralUtility::makeInstance(UriBuilder::class);
$url = (string)$uriBuilder->buildUriFromRoute('record_edit', $urlParameters);
return '<a href="' . htmlspecialchars($url) . '">' . $linkText . '</a>';
}
--
GitLab