From b6fb117f789efbe8955818bc7f120baf08d193fd Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Tue, 5 Jun 2012 12:11:20 +0200 Subject: [PATCH] Fix if tz is UTC. --- htdocs/core/lib/date.lib.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php index bba1f48a48b..5474b8062e8 100644 --- a/htdocs/core/lib/date.lib.php +++ b/htdocs/core/lib/date.lib.php @@ -105,6 +105,7 @@ function getServerTimeZoneInt($refgmtdate='now') if (dol_stringtotime($_SESSION['dol_dst_first']) <= $gmtnow && $gmtnow < dol_stringtotime($_SESSION['dol_dst_second'])) $daylight=1; else $daylight=0; $tmp=dol_mktime(0,0,0,$monthref,$dayref,$yearref,false,0)-dol_mktime(0,0,0,$monthref,$dayref,$yearref,true,0)-($daylight*3600); + if (ini_get("date.timezone")=='UTC') return 0; return 'unknown'; } elseif ($refgmtdate == 'summer') @@ -114,6 +115,7 @@ function getServerTimeZoneInt($refgmtdate='now') if (dol_stringtotime($_SESSION['dol_dst_first']) <= dol_stringtotime($yearref.'-'.$monthref.'-'.$dayref) && dol_stringtotime($yearref.'-'.$monthref.'-'.$dayref) < dol_stringtotime($_SESSION['dol_dst_second'])) $daylight=1; else $daylight=0; $tmp=dol_mktime(0,0,0,$monthref,$dayref,$yearref,false,0)-dol_mktime(0,0,0,$monthref,$dayref,$yearref,true,0)-($daylight*3600); + if (ini_get("date.timezone")=='UTC') return 0; return 'unknown'; } else $tmp=dol_mktime(0,0,0,1,1,1970);