Merge pull request #390 from andersundsehr/bugfix/page-endtime

🐛 fix lifetime for page.endtime values
lochmueller · Jul 17, 2023 · a1cffe0 · a1cffe0
2 parents ddd51b7 + 48b0bac
commit a1cffe0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/Middleware/GenerateMiddleware.php b/Classes/Middleware/GenerateMiddleware.php
@@ -97,8 +97,8 @@ protected function calculateLifetime(TypoScriptFrontendController $tsfe): int
         $timeOutTime = $tsfe->get_cache_timeout();
 
         // If page has a endtime before the current timeOutTime, use it instead:
-        if ($tsfe->page['endtime'] > 0 && $tsfe->page['endtime'] < $timeOutTime) {
-            $endtimeLifetime = $tsfe->page['endtime'] - time();
+        if ($tsfe->page['endtime'] > 0 && ($tsfe->page['endtime'] - $GLOBALS['EXEC_TIME']) < $timeOutTime) {
+            $endtimeLifetime = $tsfe->page['endtime'] - $GLOBALS['EXEC_TIME'];
             if ($endtimeLifetime > 0) {
                 $timeOutTime = $endtimeLifetime;
             }