From 71ea2a179a8ef82f990ed08d689d878bdf024e2b Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 04 Jan 2012 10:15:19 -0500
Subject: [PATCH] - Fixed: FS#1936 - date(): It is not safe to rely on the system's timezone settings. - Added a timezone setting in config.inc.ohp file
---
install/update.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/install/update.php b/install/update.php
index 769cdce..4da9fce 100644
--- a/install/update.php
+++ b/install/update.php
@@ -96,6 +96,8 @@
$conf["mysql"]["ispconfig_password"] = $conf_old["db_password"];
$conf['language'] = $conf_old['language'];
if($conf['language'] == '{language}') $conf['language'] = 'en';
+$conf['timezone'] = $conf_old['timezone'];
+if($conf['timezone'] == '{timezone}') $conf['timezone'] = 'UTC';
if(isset($conf_old["dbmaster_host"])) $conf["mysql"]["master_host"] = $conf_old["dbmaster_host"];
if(isset($conf_old["dbmaster_database"])) $conf["mysql"]["master_database"] = $conf_old["dbmaster_database"];
--
Gitblit v1.9.1