From 5771457d5f093a47f41827ac89c7c5832d3e33c8 Mon Sep 17 00:00:00 2001
From: Tymoteusz Motylewski <t.motylewski@gmail.com>
Date: Sat, 25 Nov 2017 00:00:24 +0100
Subject: [PATCH] [BUGFIX] Redirect to the list after save&close in text file
 edit form

Clicking on the Save & Close button in the FileList
text file editing form redirects back to the list view.

Releases: master
Resolves: #83090
Change-Id: I14576da7a77835232ca9573a8964f0d754f52aff
Reviewed-on: https://review.typo3.org/54757
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Susanne Moog <susanne.moog@typo3.org>
Tested-by: Susanne Moog <susanne.moog@typo3.org>
---
 .../backend/Classes/Controller/File/EditFileController.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
index 8429776d590d..ef5d9c6a5234 100644
--- a/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
+++ b/typo3/sysext/backend/Classes/Controller/File/EditFileController.php
@@ -302,20 +302,19 @@ class EditFileController
         $saveButton = $buttonBar->makeInputButton()
             ->setName('_save')
             ->setValue('1')
-            ->setOnClick('document.editform.submit();')
             ->setForm('EditFileController')
             ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.submit'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon('actions-document-save', Icon::SIZE_SMALL));
 
         // Save and Close button
         $saveAndCloseButton = $buttonBar->makeInputButton()
-            ->setName('_saveandclose')
+            ->setName('_saveandclosedok')
             ->setValue('1')
             ->setForm('EditFileController')
             ->setOnClick(
-                'document.editform.redirect.value='
+                'document.editform.elements.namedItem("data[editfile][0][redirect]").value='
                 . GeneralUtility::quoteJSvalue($this->returnUrl)
-                . '; document.editform.submit();'
+                . ';'
             )
             ->setTitle($lang->sL('LLL:EXT:lang/Resources/Private/Language/locallang_core.xlf:file_edit.php.saveAndClose'))
             ->setIcon($this->moduleTemplate->getIconFactory()->getIcon(
-- 
GitLab