diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index e0837bba9..36d28649b 100755 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -30,11 +30,12 @@ namespace Icinga\Application; use \DateTimeZone; use \Exception; +use Zend_Loader_Autoloader; use Icinga\Application\Modules\Manager as ModuleManager; use Icinga\Application\Platform; use \Icinga\Application\Config; use Icinga\Exception\ConfigurationError; -use Zend_Loader_Autoloader; +use Icinga\Util\DateTimeFactory; /** * This class bootstraps a thin Icinga application layer @@ -340,20 +341,21 @@ abstract class ApplicationBootstrap } /** - * Setup timezone + * Setup time zone * * @return self - * @throws \Icinga\Exception\ConfigurationError if the timezone in config.ini isn't valid + * @throws ConfigurationError if the timezone in config.ini isn't valid */ protected function setupTimezone() { $tz = $this->config->global->get('timezone', 'UTC'); try { - new DateTimeZone($tz); + $tz = new DateTimeZone($tz); } catch (Exception $e) { throw new ConfigurationError(t('Invalid timezone') . ' "' . $tz . '"'); } date_default_timezone_set($tz); + DateTimeFactory::setConfig(array('timezone' => $tz)); return $this; } } diff --git a/library/Icinga/Util/ConfigAwareFactory.php b/library/Icinga/Util/ConfigAwareFactory.php new file mode 100644 index 000000000..4a40c4200 --- /dev/null +++ b/library/Icinga/Util/ConfigAwareFactory.php @@ -0,0 +1,19 @@ +