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