File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 33namespace Statamic \Http \Middleware \CP ;
44
55use Carbon \CarbonInterface ;
6+ use Carbon \CarbonInterval ;
67use Closure ;
78use DateTime ;
89use Illuminate \Support \Facades \Date ;
@@ -24,7 +25,11 @@ public function handle($request, Closure $next)
2425
2526 // Get original Carbon format so it can be restored later.
2627 $ originalToStringFormat = $ this ->getToStringFormat ();
27- Date::setToStringFormat (function (CarbonInterface $ date ) {
28+ Date::setToStringFormat (function (CarbonInterface |CarbonInterval $ date ) {
29+ if ($ date instanceof CarbonInterval) {
30+ return $ date ->forHumans ();
31+ }
32+
2833 return $ date ->setTimezone (Statamic::displayTimezone ())->format (Statamic::dateFormat ());
2934 });
3035
Original file line number Diff line number Diff line change 33namespace Statamic \Http \Middleware ;
44
55use Carbon \CarbonInterface ;
6+ use Carbon \CarbonInterval ;
67use Closure ;
78use Illuminate \Support \Facades \Date ;
89use ReflectionClass ;
@@ -32,7 +33,11 @@ public function handle($request, Closure $next)
3233
3334 // Get original Carbon format so it can be restored later.
3435 $ originalToStringFormat = $ this ->getToStringFormat ();
35- Date::setToStringFormat (function (CarbonInterface $ date ) {
36+ Date::setToStringFormat (function (CarbonInterface |CarbonInterval $ date ) {
37+ if ($ date instanceof CarbonInterval) {
38+ return $ date ->forHumans ();
39+ }
40+
3641 return $ date ->setTimezone (Statamic::displayTimezone ())->format (Statamic::dateFormat ());
3742 });
3843
You can’t perform that action at this time.
0 commit comments