From a2dac9394a75b220eb5c6aee6fe4e9059b2b9e22 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 6 Sep 2024 16:42:12 +0200
Subject: [PATCH] refactor: Improve handling of server timezones in scheduled
 backups and tasks

---
 app/Console/Kernel.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index b20e518b3..9daf5d362 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -137,7 +137,12 @@ class Kernel extends ConsoleKernel
             }
 
             $server = $scheduled_backup->server();
-            $serverTimezone = $server->settings->server_timezone;
+
+            if (! $server) {
+                $serverTimezone = config('app.timezone');
+            } else {
+                $serverTimezone = $server->settings->server_timezone;
+            }
 
             if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
                 $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
@@ -179,7 +184,11 @@ class Kernel extends ConsoleKernel
             }
 
             $server = $scheduled_task->server();
-            $serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
+            if (! $server) {
+                $serverTimezone = config('app.timezone');
+            } else {
+                $serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
+            }
 
             if (isset(VALID_CRON_STRINGS[$scheduled_task->frequency])) {
                 $scheduled_task->frequency = VALID_CRON_STRINGS[$scheduled_task->frequency];