From 08b572e5cdb9c4213b735ee0f2b0aa8c5393b9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= <cneytsenturk@gmail.com>
Date: Tue, 5 Oct 2021 18:14:22 +0300
Subject: [PATCH] fixed empty timezone issue #12pf5g2

---
 app/Utilities/Overrider.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Utilities/Overrider.php b/app/Utilities/Overrider.php
index 912c0f704..0c59779b0 100644
--- a/app/Utilities/Overrider.php
+++ b/app/Utilities/Overrider.php
@@ -26,7 +26,13 @@ class Overrider
     protected static function loadSettings()
     {
         // Timezone
-        config(['app.timezone' => setting('localisation.timezone', 'UTC')]);
+        $timezone = setting('localisation.timezone');
+
+        if (empty($timezone)) {
+            $timezone = config('setting.fallback.localisation.timezone')
+        }
+
+        config(['app.timezone' => $timezone]);
         date_default_timezone_set(config('app.timezone'));
 
         // Email