From 2b9aa323627aa781345464437f34243665d7acd7 Mon Sep 17 00:00:00 2001 From: mdtrooper Date: Tue, 28 May 2013 12:37:51 +0000 Subject: [PATCH] 2013-05-28 Miguel de Dios * include/config_process.php: set the timezone in init values for PHP because for example it is used in the library for report PDF. MERGED FROM THE BRANCH PANDORA_4 git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8219 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 7 +++++++ pandora_console/include/config_process.php | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index 7747e2ac8a..f614ae7f14 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,10 @@ +2013-05-28 Miguel de Dios + + * include/config_process.php: set the timezone in init values for + PHP because for example it is used in the library for report PDF. + + MERGED FROM THE BRANCH PANDORA_4 + 2013-05-28 Junichi Satoh * include/help/ja/help_module_interval_factor.php: Added a new help diff --git a/pandora_console/include/config_process.php b/pandora_console/include/config_process.php index 29fb97e1f9..fbe81f3c5d 100644 --- a/pandora_console/include/config_process.php +++ b/pandora_console/include/config_process.php @@ -27,8 +27,12 @@ $pandora_version = 'v5.0dev'; // Do not overwrite default timezone set if defined. $script_tz = @date_default_timezone_get(); -if (empty($script_tz)){ +if (empty($script_tz)) { date_default_timezone_set("Europe/Berlin"); + ini_set("date.timezone", "Europe/Berlin"); +} +else { + ini_set("date.timezone", $script_tz); } global $develop_bypass;