derick Mon Nov 15 11:31:12 2004 EDT
Modified files:
/php-src/ext/standard parsedate.y
Log:
- MF5.0: Fixed bug #28599 (strtotime fails with zero base time).
http://cvs.php.net/diff.php/php-src/ext/standard/parsedate.y?r1=1.56&r2=1.57&ty=u
Index: php-src/ext/standard/parsedate.y
diff -u php-src/ext/standard/parsedate.y:1.56
php-src/ext/standard/parsedate.y:1.57
--- php-src/ext/standard/parsedate.y:1.56 Thu Apr 8 15:21:05 2004
+++ php-src/ext/standard/parsedate.y Mon Nov 15 11:31:12 2004
@@ -8,7 +8,7 @@
** This code is in the public domain and has no copyright.
*/
-/* $Id: parsedate.y,v 1.56 2004/04/08 19:21:05 derick Exp $ */
+/* $Id: parsedate.y,v 1.57 2004/11/15 16:31:12 derick Exp $ */
#include "php.h"
@@ -1079,7 +1079,7 @@
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)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
