bugfix port

diff --git a/ext/standard/datetime.c b/ext/standard/datetime.c
index d697928f3f6bad5d69a7c26f8a8c3520987170bb..6cf2c37cb50fd7c29a6ae84718853abf6d24ca21 100644 (file)
--- a/ext/standard/datetime.c
+++ b/ext/standard/datetime.c
@@ -94,18 +94,16 @@ void _php3_mktime(INTERNAL_FUNCTION_PARAMETERS, int gm)
                convert_to_long(arguments[i]);
        }
        t=time(NULL);
-       if (gm) {
-               tn = gmtime(&t);
 #if HAVE_TZSET
-               tzset();
-#if HAVE_TM_ZONE
+       tzset();
+#endif
+       tn = localtime(&t);
+       if (gm) {
+#if HAVE_TM_GMTOFF
                gmadjust=(tn->tm_gmtoff)/3600;
 #else
                gmadjust=timezone/3600;
 #endif
-#endif
-       } else {
-               tn = localtime(&t);
        }
        memcpy(&ta,tn,sizeof(struct tm));
        ta.tm_isdst = -1;