From 2dd6746808c19821f5d16ddc2e214c1701019daa Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Fri, 06 Jan 2012 06:42:03 -0500
Subject: [PATCH] - Improvded timezone setting.
---
install/update.php | 2 +-
server/lib/app.inc.php | 2 +-
interface/lib/app.inc.php | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/install/update.php b/install/update.php
index 548e114..8786658 100644
--- a/install/update.php
+++ b/install/update.php
@@ -97,7 +97,7 @@
$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($conf['timezone'] == '{timezone}' or trim($conf['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"];
diff --git a/interface/lib/app.inc.php b/interface/lib/app.inc.php
index f6fcf21..060472b 100644
--- a/interface/lib/app.inc.php
+++ b/interface/lib/app.inc.php
@@ -32,7 +32,7 @@
ob_start('ob_gzhandler');
//* Set timezone
-if(isset($conf['timezone'])) date_default_timezone_set($conf['timezone']);
+if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);
//* Set error reporting level when we are not on a developer system
if(DEVSYSTEM == 0) {
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 3e39f6f..3065170 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -29,7 +29,7 @@
*/
//* Set timezone
-if(isset($conf['timezone'])) date_default_timezone_set($conf['timezone']);
+if(isset($conf['timezone']) && $conf['timezone'] != '') date_default_timezone_set($conf['timezone']);
class app {
--
Gitblit v1.9.1