]> granicus.if.org Git - php/commitdiff
- MF5.0: Fixed bug #28599 (strtotime fails with zero base time).
authorDerick Rethans <derick@php.net>
Mon, 15 Nov 2004 16:31:12 +0000 (16:31 +0000)
committerDerick Rethans <derick@php.net>
Mon, 15 Nov 2004 16:31:12 +0000 (16:31 +0000)
ext/standard/parsedate.y

index 6776550d24c72c396700e42ab8837fc494b7ccae..b5eec08ea518efec2075dd1f19407ac727de1eb4 100644 (file)
@@ -1079,7 +1079,7 @@ time_t php_parse_date(char *p, time_t *now)
   tm.tm_year = ToYear (date.yyYear) - TM_YEAR_ORIGIN + date.yyRelYear;
   tm.tm_mon = date.yyMonth - 1 + date.yyRelMonth;
   tm.tm_mday = date.yyDay + date.yyRelDay;
-  if (date.yyHaveTime /*|| (date.yyHaveRel && !date.yyHaveDate && !date.yyHaveDay) */)
+  if (date.yyHaveTime || (date.yyHaveRel && !date.yyHaveDate && !date.yyHaveDay))
     {
       tm.tm_hour = ToHour (date.yyHour, date.yyMeridian);
       if (tm.tm_hour < 0)