From 08d5ce1f30eb0a8d360dc2ddb91dbcb8f5f9cd4e Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Dec 2009 01:48:51 +0000 Subject: [PATCH] fixed not used user date and time format, if no timezone set --- phpgwapi/inc/class.egw_time.inc.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/phpgwapi/inc/class.egw_time.inc.php b/phpgwapi/inc/class.egw_time.inc.php index d46eb29151..06f14b26b8 100644 --- a/phpgwapi/inc/class.egw_time.inc.php +++ b/phpgwapi/inc/class.egw_time.inc.php @@ -399,16 +399,13 @@ class egw_time extends DateTime $GLOBALS['egw_info']['server']['server_timezone'] = date_default_timezone_get(); } self::$server_timezone = new DateTimeZone($GLOBALS['egw_info']['server']['server_timezone']); - if (isset($GLOBALS['egw_info']['user']['preferences']['common']['tz'])) + if (!isset($GLOBALS['egw_info']['user']['preferences']['common']['tz'])) { - self::setUserPrefs($GLOBALS['egw_info']['user']['preferences']['common']['tz'], - $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], - $GLOBALS['egw_info']['user']['preferences']['common']['timeformat']); - } - else - { - self::$user_timezone = clone(self::$server_timezone); + $GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone']; } + self::setUserPrefs($GLOBALS['egw_info']['user']['preferences']['common']['tz'], + $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], + $GLOBALS['egw_info']['user']['preferences']['common']['timeformat']); } /**