Skip to content
Snippets Groups Projects
Commit 52c7c723 authored by c.essl's avatar c.essl Committed by Frank Naegler
Browse files

[BUGFIX] Clamp "simulateDate" timestamp to minimum 60 seconds

In order to avoid RuntimeExceptions, the "simulateDate" TSConfig setting
for the  adminpanel has to be at least 60 seconds. Otherwise
$GLOBALS['SIM_ACCESS_TIME'] will be set to 0.

Resolves: #88437
Releases: master, 9.5
Change-Id: I0377eb4e1d96636367529d185181f61affed44fc
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/60821


Tested-by: default avatarTYPO3com <noreply@typo3.com>
Tested-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: default avatarFrank Naegler <frank.naegler@typo3.org>
Reviewed-by: default avatarBenni Mack <benni@typo3.org>
Reviewed-by: default avatarOliver Klee <typo3-coding@oliverklee.de>
Reviewed-by: default avatarAndreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: default avatarFrank Naegler <frank.naegler@typo3.org>
parent 06a2e043
Branches
Tags
No related merge requests found
......@@ -240,6 +240,7 @@ class PreviewModule extends AbstractModule implements InitializableInterface, Pa
}
if ($date !== false) {
$simTime = $date->getTimestamp();
$simTime = max($simTime, 60);
}
return $simTime ?? null;
}
......
......@@ -28,7 +28,11 @@ class PreviewModuleTest extends UnitTestCase
(int)(new \DateTime('2018-01-01 12:00:15 UTC'))->getTimestamp(),
(int)(new \DateTime('2018-01-01 12:00:00 UTC'))->getTimestamp(),
],
'timestamp_1970' => [
(string)(new \DateTime('1970-01-01 00:00:15 UTC'))->getTimestamp(),
(int)(new \DateTime('1970-01-01 00:00:60 UTC'))->getTimestamp(),
(int)(new \DateTime('1970-01-01 00:00:60 UTC'))->getTimestamp(),
],
];
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment