tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-28 16:24:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add timezone detection to `setupTimezone' in ApplicationBootstrap

Browse Source
This commit is contained in:
Alexander Fuhr 2014-11-12 12:13:46 +01:00
parent 8d4e56a1fe
commit 8d120762de
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -14,6 +14,7 @@ use Icinga\Exception\NotReadableError;
use Icinga\Application\Logger; use Icinga\Application\Logger;
use Icinga\Util\DateTimeFactory; use Icinga\Util\DateTimeFactory;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Util\TimezoneDetect;
use Icinga\Exception\IcingaException; use Icinga\Exception\IcingaException;
/** /**
@ -441,7 +442,14 @@ abstract class ApplicationBootstrap
*/ */
protected function setupTimezone() protected function setupTimezone()
{ {
$default = @date_default_timezone_get(); $detect = new TimezoneDetect();
if ($detect->success()) {
$default = $detect->getTimezoneName();
} else {
$default = @date_default_timezone_get();
}
if (! $default) { if (! $default) {
$default = 'UTC'; $default = 'UTC';
} }