From 1f9235cf0f9503d4cc9a0d169aec71e3d1526447 Mon Sep 17 00:00:00 2001
From: Benni Mack <benni@typo3.org>
Date: Tue, 14 Dec 2021 15:38:34 +0100
Subject: [PATCH] [BUGFIX] Consider Context API when using f:format.date

Resolves: #94308
Releases: main, 11.5
Change-Id: I84836ba46e3b8e3fa8d4ac915efb5a6a7afbdca7
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/72657
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: Christian Kuhn <lolli@schwarzbu.ch>
Tested-by: Benni Mack <benni@typo3.org>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: Christian Kuhn <lolli@schwarzbu.ch>
Reviewed-by: Benni Mack <benni@typo3.org>
---
 .../sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php b/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
index 7c0580c8dc6f..548ea82d7550 100644
--- a/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
+++ b/typo3/sysext/fluid/Classes/ViewHelpers/Format/DateViewHelper.php
@@ -150,7 +150,7 @@ class DateViewHelper extends AbstractViewHelper
         }
 
         if ($date === '') {
-            $date = 'now';
+            $date = GeneralUtility::makeInstance(Context::class)->getPropertyFromAspect('date', 'timestamp', 'now');
         }
 
         if (!$date instanceof \DateTimeInterface) {
-- 
GitLab