Parse ...Z date strings to local time correctly

2024-09-06 10:41:21 +02:00
parent 6044a670d7
commit 35713d2974
2 changed files with 3 additions and 3 deletions
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -144,7 +144,7 @@ class Controller extends BaseController

    protected static function JsonToDateTime($obj)
    {
-        return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : new \DateTime($obj);
+        return is_object($obj) ? new \DateTime($obj->date, new \DateTimeZone($obj->timezone)) : \Carbon\Carbon::parse($obj)->setTimezone(date_default_timezone_get());
    }

    public function __call($method, $arguments)