From 9ed34dbdb2ee626486178c1f112409860d59a6fa Mon Sep 17 00:00:00 2001 From: Dan Harrin Date: Thu, 21 Dec 2023 15:18:24 +0000 Subject: [PATCH] Update DateTimePicker.php --- packages/forms/src/Components/DateTimePicker.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/forms/src/Components/DateTimePicker.php b/packages/forms/src/Components/DateTimePicker.php index c52cbd49c36..bda6240fe27 100644 --- a/packages/forms/src/Components/DateTimePicker.php +++ b/packages/forms/src/Components/DateTimePicker.php @@ -84,10 +84,10 @@ protected function setUp(): void if (! $state instanceof CarbonInterface) { try { - $state = Carbon::createFromFormat($component->getFormat(), $state, $component->getTimezone()); + $state = Carbon::createFromFormat($component->getFormat(), $state, config('app.timezone')); } catch (InvalidFormatException $exception) { try { - $state = Carbon::parse($state, $component->getTimezone()); + $state = Carbon::parse($state, config('app.timezone')); } catch (InvalidFormatException $exception) { $component->state(null); @@ -96,7 +96,7 @@ protected function setUp(): void } } - $state->setTimezone($component->getTimezone()); + $state = $state->setTimezone($component->getTimezone()); if (! $component->isNative()) { $component->state((string) $state);