[BUGFIX] Simulate time ignored using Admin Panel

Fixes ignoring selected Simulate time in frontend admin panel and correctly showing the Preview Info
lsascha · Jun 25, 2020 · 59c23fd · 59c23fd
1 parent 8cb2b24
commit 59c23fd
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/typo3/sysext/frontend/Classes/Middleware/PreviewSimulator.php b/typo3/sysext/frontend/Classes/Middleware/PreviewSimulator.php
@@ -53,7 +53,6 @@ public function __construct()
     public function process(ServerRequestInterface $request, RequestHandlerInterface $handler): ResponseInterface
     {
         if ((bool)$this->context->getPropertyFromAspect('backend.user', 'isLoggedIn', false)) {
-            $GLOBALS['TSFE']->clear_preview();
             $simulatingDate = $this->simulateDate($request);
             $simulatingGroup = $this->simulateUserGroup($request);
             $GLOBALS['TSFE']->fePreview = ((int)($simulatingDate || $simulatingGroup));
@@ -78,6 +77,9 @@ protected function simulateDate(ServerRequestInterface $request): bool
     {
         $simulatedDate = null;
         $queryTime = $request->getQueryParams()['ADMCMD_simTime'] ?? false;
+        if ($queryTime === false && $GLOBALS['SIM_ACCESS_TIME'] !== $GLOBALS['ACCESS_TIME']) {
+            $queryTime = $GLOBALS['SIM_ACCESS_TIME'];
+        }
         if (!$queryTime) {
             return false;
         }