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

Bootstrap/timezone: do not enforce config

Browse Source 
The current way forces people running a correctly configured PHP
to configure timezone once again in Icinga Web. We want LESS config,
so this tries to fix this.
This commit is contained in:
Thomas Gelf 2014-06-20 12:54:37 +02:00
parent f498cd0c81
commit 559457f730
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,7 +457,11 @@ abstract class ApplicationBootstrap
*/ */
protected function setupTimezone() protected function setupTimezone()
{ {
$timeZoneString = $this->config->global !== null ? $this->config->global->get('timezone', 'UTC') : 'UTC'; $default = @date_default_timezone_get();
if (! $default) {
$default = 'UTC';
}
$timeZoneString = $this->config->global !== null ? $this->config->global->get('timezone', $default) : $default;
date_default_timezone_set($timeZoneString); date_default_timezone_set($timeZoneString);
DateTimeFactory::setConfig(array('timezone' => $timeZoneString)); DateTimeFactory::setConfig(array('timezone' => $timeZoneString));
return $this; return $this;