summaryrefslogtreecommitdiff
path: root/ext/standard
diff options
context:
space:
mode:
authorJames Moore <jmoore@php.net>2001-11-07 14:22:15 +0000
committerJames Moore <jmoore@php.net>2001-11-07 14:22:15 +0000
commitf111b84e0516594dc4b03bf9824e1c13a19c921c (patch)
tree9344d68fdd8f3d293cc0643e6be210018f7671ae /ext/standard
parent61cad20c12d9f6aba9704b5a41cfe3447b0513f1 (diff)
downloadphp-git-f111b84e0516594dc4b03bf9824e1c13a19c921c.tar.gz
@ - Fix Bug 9878 (patch by bfoddy@mediaone.net) (jmoore)
Diffstat (limited to 'ext/standard')
-rw-r--r--ext/standard/datetime.c5
1 files changed, 2 insertions, 3 deletions
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;
}