From: James Moore <jmoore@php.net>
Date: Wed, 7 Nov 2001 14:22:15 +0000 (+0000)
Subject: @ - Fix Bug 9878 (patch by bfoddy@mediaone.net) (jmoore)
X-Git-Tag: ChangeLog~397
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f111b84e0516594dc4b03bf9824e1c13a19c921c;p=php

@ - Fix Bug 9878 (patch by bfoddy@mediaone.net) (jmoore)
---

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index c9759c6801..b86b4e127e 100644
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -182,10 +182,9 @@ void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
 #else
 	    /*
 	    ** If correcting for daylight savings time, we set the adjustment to
-		** the value of timezone - 3600 seconds. Otherwise, we need to overcorrect and
-		** set the adjustment to the main timezone + 3600 seconds.
+		** the value of timezone - 3600 seconds.
 	    */
-	    gmadjust = -(is_dst ? timezone - 3600 : timezone + 3600);
+	    gmadjust = -(is_dst ? timezone - 3600 : timezone);
 #endif
 		seconds += gmadjust;
 	}