summaryrefslogtreecommitdiff
path: root/roundcubemail/program/include/main.inc
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-03 17:17:17 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2008-09-03 17:17:17 +0000
commit59344c4b90e186bb90d667dca82bc7ef7d145eaf (patch)
tree855e83006f88574d11295e656dba3c154208d8ec /roundcubemail/program/include/main.inc
parent9e4123cc2a54fffb671ec67577b46046a16d899c (diff)
Interesting: (0 == 'auto') => true
git-svn-id: https://svn.roundcube.net/trunk@1723 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/include/main.inc')
-rw-r--r--roundcubemail/program/include/main.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 469d8441c..3fad9cbfb 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -706,8 +706,8 @@ function format_date($date, $format=NULL)
return '';
// get user's timezone
- if ($CONFIG['timezone'] == 'auto')
- $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : intval(date('O'))/100;
+ if ($CONFIG['timezone'] === 'auto')
+ $tz = isset($_SESSION['timezone']) ? $_SESSION['timezone'] : date('Z')/3600;
else {
$tz = $CONFIG['timezone'];
if ($CONFIG['dst_active'])