diff --git a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
index 8ad2982a6140458901953bf0056a90567cbf1a59..4ce2274088b20057b6d9f120d88bc16e5d886073 100644
--- a/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
+++ b/typo3/sysext/backend/Classes/Controller/EditDocumentController.php
@@ -36,6 +36,7 @@ use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\HttpUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Extbase\SignalSlot\Dispatcher;
use TYPO3\CMS\Frontend\Page\PageRepository;
@@ -1522,7 +1523,7 @@ class EditDocumentController extends AbstractModule
*/
public function shortCutLink()
{
- if ($this->returnUrl !== ExtensionManagementUtility::extRelPath('backend') . 'Resources/Private/Templates/Close.html') {
+ if ($this->returnUrl !== GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Public/Html/Close.html')) {
$shortCutButton = $this->moduleTemplate->getDocHeaderComponent()->getButtonBar()->makeShortcutButton();
$shortCutButton->setModuleName($this->MCONF['name'])
->setGetVariables([
@@ -1543,10 +1544,10 @@ class EditDocumentController extends AbstractModule
*/
public function openInNewWindowLink()
{
- $backendRelPath = ExtensionManagementUtility::extRelPath('backend');
- if ($this->returnUrl !== $backendRelPath . 'Resources/Private/Templates/Close.html') {
+ $closeUrl = GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Public/Html/Close.html');
+ if ($this->returnUrl !== $closeUrl) {
$aOnClick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue(GeneralUtility::linkThisScript(
- ['returnUrl' => $backendRelPath . 'Resources/Private/Templates/Close.html']
+ ['returnUrl' => PathUtility::getAbsoluteWebPath($closeUrl)]
))
. ','
. GeneralUtility::quoteJSvalue(md5($this->R_URI))
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Close.html b/typo3/sysext/backend/Resources/Private/Templates/Close.html
index e5fbc77bef0b6706b2845d917b681e84c0f38bc7..5a0cfc59ebc8e6e6a1ebe742d9066ecbc89939fa 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Close.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Close.html
@@ -2,7 +2,7 @@
<html>
<head>
<!-- Close script, used in particular by FormEngine to close the current edit window -->
- <!-- TYPO3 Script ID: typo3/sysext/backend/Resources/Private/Templates/close.html -->
+ <!-- TYPO3 Script ID: typo3/sysext/backend/Resources/Private/Templates/Close.html -->
<meta charset="utf-8" />
<title>Close</title>
<script type="text/javascript">
@@ -12,4 +12,4 @@
</head>
<body>
</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/typo3/sysext/backend/Resources/Public/Html/Close.html b/typo3/sysext/backend/Resources/Public/Html/Close.html
new file mode 100644
index 0000000000000000000000000000000000000000..1a4faf689b96d77db077a63fe3547a161f38ed2c
--- /dev/null
+++ b/typo3/sysext/backend/Resources/Public/Html/Close.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html>
+ <head>
+ <!-- Close script, used in particular by FormEngine to close the current edit window -->
+ <!-- TYPO3 Script ID: typo3/sysext/backend/Resources/Public/Html/Close.html -->
+ <meta charset="utf-8" />
+ <title>Close</title>
+ <script type="text/javascript">
+ self.close();
+ window.opener.location.reload(true);
+ </script>
+ </head>
+ <body>
+ </body>
+</html>
diff --git a/typo3/sysext/feedit/Classes/FrontendEditPanel.php b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
index 51687dea5e5200b58fd9d865ff1063c0e730491f..1ca8675f4c4f485df397dae2ffdaabf265c1dae7 100644
--- a/typo3/sysext/feedit/Classes/FrontendEditPanel.php
+++ b/typo3/sysext/feedit/Classes/FrontendEditPanel.php
@@ -19,9 +19,9 @@ use TYPO3\CMS\Core\Database\DatabaseConnection;
use TYPO3\CMS\Core\Imaging\Icon;
use TYPO3\CMS\Core\Imaging\IconFactory;
use TYPO3\CMS\Core\Type\Bitmask\JsConfirmation;
-use TYPO3\CMS\Core\Utility\ExtensionManagementUtility;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\MathUtility;
+use TYPO3\CMS\Core\Utility\PathUtility;
use TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController;
use TYPO3\CMS\Frontend\View\AdminPanelView;
@@ -304,7 +304,7 @@ class FrontendEditPanel
*/
protected function editPanelLinkWrap_doWrap($string, $url, $additionalClasses = '')
{
- $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . rawurlencode(ExtensionManagementUtility::extRelPath('backend') . 'Resources/Private/Templates/Close.html')) . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
+ $onclick = 'vHWin=window.open(' . GeneralUtility::quoteJSvalue($url . '&returnUrl=' . rawurlencode(PathUtility::getAbsoluteWebPath(GeneralUtility::getFileAbsFileName('EXT:backend/Resources/Public/Html/Close.html')))) . ',\'FEquickEditWindow\',\'width=690,height=500,status=0,menubar=0,scrollbars=1,resizable=1\');vHWin.focus();return false;';
return '<a href="#" class="btn btn-default btn-sm ' . htmlspecialchars($additionalClasses) . '" onclick="' . htmlspecialchars($onclick) . '" class="frontEndEditIconLinks">' . $string . '</a>';
}