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

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

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 9daf5d362..58ab13a82 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -139,7 +139,7 @@ class Kernel extends ConsoleKernel
             $server = $scheduled_backup->server();
 
             if (! $server) {
-                $serverTimezone = config('app.timezone');
+                continue;
             } else {
                 $serverTimezone = $server->settings->server_timezone;
             }
@@ -185,7 +185,7 @@ class Kernel extends ConsoleKernel
 
             $server = $scheduled_task->server();
             if (! $server) {
-                $serverTimezone = config('app.timezone');
+                continue;
             } else {
                 $serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
             }

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

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

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
index 58ab13a82..96740ab24 100644
--- a/app/Console/Kernel.php
+++ b/app/Console/Kernel.php
@@ -140,9 +140,8 @@ class Kernel extends ConsoleKernel
 
             if (! $server) {
                 continue;
-            } else {
-                $serverTimezone = $server->settings->server_timezone;
             }
+            $serverTimezone = $server->settings->server_timezone;
 
             if (isset(VALID_CRON_STRINGS[$scheduled_backup->frequency])) {
                 $scheduled_backup->frequency = VALID_CRON_STRINGS[$scheduled_backup->frequency];
@@ -186,9 +185,8 @@ class Kernel extends ConsoleKernel
             $server = $scheduled_task->server();
             if (! $server) {
                 continue;
-            } else {
-                $serverTimezone = $server->settings->server_timezone ?: config('app.timezone');
             }
+            $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];