fixed empty timezone issue #12pf5g2

2021-10-05 18:14:22 +03:00 · 2021-10-05 18:14:22 +03:00 · 08b572e5cd
commit 08b572e5cd
parent c9f7ea905a
1 changed files with 7 additions and 1 deletions
--- 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