diff options
| author | Derick Rethans <derick@php.net> | 2004-11-15 16:31:12 +0000 |
|---|---|---|
| committer | Derick Rethans <derick@php.net> | 2004-11-15 16:31:12 +0000 |
| commit | d79407f4fd35ee69705f0c5b8eac85f60b001ad5 (patch) | |
| tree | adf2314a14624b0a2fb6731586c4fed1eed5e05b | |
| parent | 71d9afee0c42b866b4f2ebbd1ec451ac301e0186 (diff) | |
| download | php-git-d79407f4fd35ee69705f0c5b8eac85f60b001ad5.tar.gz | |
- MF5.0: Fixed bug #28599 (strtotime fails with zero base time).
| -rw-r--r-- | ext/standard/parsedate.y | 2 |
1 files changed, 1 insertions, 1 deletions
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) |