diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 601337f3..398b135a 100644 --- 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) diff --git a/resources/views/partial/radioscheduleweek.blade.php b/resources/views/partial/radioscheduleweek.blade.php index 73e461eb..f997f585 100644 --- a/resources/views/partial/radioscheduleweek.blade.php +++ b/resources/views/partial/radioscheduleweek.blade.php @@ -16,7 +16,7 @@ {{$item['program']->name}}