From 4c7011d24ff03b4a9b79a204943170f02fca3c8c Mon Sep 17 00:00:00 2001
From: Gianluigi Martino <gmartino27@gmail.com>
Date: Thu, 3 Mar 2016 22:32:01 +0100
Subject: [PATCH] [BUGFIX] Keep selected page active after save & close

Keep the currently selected page active when editing the page properties
of another page as non-admin user.

Change-Id: Iad438ad7e20ab8d818286053557ade26542d8216
Resolves: #71094
Releases: master, 7.6, 6.2
Reviewed-on: https://review.typo3.org/47028
Reviewed-by: Benni Mack <benni@typo3.org>
Reviewed-by: Nicole Cordes <typo3@cordes.co>
Tested-by: Nicole Cordes <typo3@cordes.co>
Reviewed-by: Frederic Gaus <frederic.gaus@flagbit.de>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
---
 .../backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
index 25713970ef57..223809bef54a 100644
--- a/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
+++ b/typo3/sysext/backend/Classes/Tree/Pagetree/ExtdirectTreeCommands.php
@@ -358,7 +358,9 @@ class ExtdirectTreeCommands
         if (empty($mountPoints)) {
             $mountPoints = array(0);
         }
-        $mountPoints[] = (int)$GLOBALS['BE_USER']->uc['pageTree_temporaryMountPoint'];
+        if (!empty($GLOBALS['BE_USER']->uc['pageTree_temporaryMountPoint'])){
+            $mountPoints[] = (int)$GLOBALS['BE_USER']->uc['pageTree_temporaryMountPoint'];
+        }
         $mountPoints = array_unique($mountPoints);
         /** @var $userSettingsController \TYPO3\CMS\Backend\Controller\UserSettingsController */
         $userSettingsController = GeneralUtility::makeInstance(\TYPO3\CMS\Backend\Controller\UserSettingsController::class);
-- 
GitLab