tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-05-28 Miguel de Dios <miguel.dedios@artica.es> 

* 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
This commit is contained in:
mdtrooper 2013-05-28 12:37:51 +00:00
parent 593e540d67
commit 4a13628363
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2013-05-28 Miguel de Dios <miguel.dedios@artica.es>
* 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 <junichi@rworks.jp>
* include/help/ja/help_module_interval_factor.php: Added a new help

6
pandora_console/include/config_process.php
View File

@ -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;