From 07a6ee67e24d61f59c193121e38216b85cf739af Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 5 Jun 2012 12:42:32 +0200
Subject: [PATCH] Minor perf enhancement

---
 htdocs/core/lib/date.lib.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
index 946c81fa7ad..b2c9c15faa8 100644
--- a/htdocs/core/lib/date.lib.php
+++ b/htdocs/core/lib/date.lib.php
@@ -100,25 +100,23 @@ function getServerTimeZoneInt($refgmtdate='now')
         // Method 2 (does not include daylight, not supported by adodb)
         if ($refgmtdate == 'now')
         {
+            if (ini_get("date.timezone")=='UTC') return 0;
             // We don't know server timezone string, so we don't know location, so we can't guess daylight. We assume we use same than client. Fix is to use MAIN_NEW_DATE.
             $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref=dol_print_date($gmtnow,'%m'); $dayref=dol_print_date($gmtnow,'%d');
             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 $tmp;           // For compatibility result
-            //return 'unknown';    // For true result
+            //return 'unknown';    // For true result (commented for compatibility result)
         }
         elseif ($refgmtdate == 'summer')
         {
+            if (ini_get("date.timezone")=='UTC') return 0;
             // We don't know server timezone string, so we don't know location, so we can't guess daylight. We assume we use same than client. Fix is to use MAIN_NEW_DATE.
             $gmtnow=dol_now('gmt'); $yearref=dol_print_date($gmtnow,'%Y'); $monthref='08'; $dayref='01';
             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 $tmp;           // For compatibility result
-            //return 'unknown';    // For true result
+            //return 'unknown';    // For true result (commented for compatibility result)
         }
         else $tmp=dol_mktime(0,0,0,1,1,1970);
     }