From 5d4cdfe13f5b51e0b50ca1124ddf3e7a3ab2ff21 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Tue, 16 Apr 2019 10:35:36 +0200 Subject: [PATCH] ApplicationBootstrap#setupTimezone(): ensure a vaild default timezone to be set in any case --- library/Icinga/Application/ApplicationBootstrap.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 8d658061d..be654f8f9 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -618,11 +618,7 @@ abstract class ApplicationBootstrap { $timezone = $this->detectTimeZone(); if ($timezone === null || @date_default_timezone_set($timezone) === false) { - $timezone = @date_default_timezone_get(); - if ($timezone === false) { - $timezone = 'UTC'; - date_default_timezone_set($timezone); - } + date_default_timezone_set(@date_default_timezone_get()); } return $this; }