From: Derick Rethans Date: Mon, 15 Nov 2004 16:31:12 +0000 (+0000) Subject: - MF5.0: Fixed bug #28599 (strtotime fails with zero base time). X-Git-Tag: RELEASE_0_2~686 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d79407f4fd35ee69705f0c5b8eac85f60b001ad5;p=php - MF5.0: Fixed bug #28599 (strtotime fails with zero base time). --- diff --git a/ext/standard/parsedate.y b/ext/standard/parsedate.y index 6776550d24..b5eec08ea5 100644 --- a/ext/standard/parsedate.y +++ b/ext/standard/parsedate.y @@ -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)