cvs: /php3/functions datetime.c

sas Fri Feb 25 09:17:13 2000 EDT Modified files: /php3/functions datetime.c Log: Merge in mktime windowing from php4 Index: php3/functions/datetime.c diff -u php3/functions/datetime.c:1.84 php3/functions/datetime.c:1.85 --- php3/functions/datetime.c:1.84 Fri Feb 25 09:01:39 2000 +++ php3/functions/datetime.c Fri Feb 25 09:16:41 2000 @@ -28,7 +28,7 @@ | Rasmus Lerdorf <rasmus@php.net> | +----------------------------------------------------------------------+ */ -/* $Id: datetime.c,v 1.84 2000/02/25 17:01:39 zeev Exp $ */ +/* $Id: datetime.c,v 1.85 2000/02/25 17:16:41 sas Exp $ */ #include "php.h" #include "internal_functions.h" #include "operators.h" @@ -119,7 +119,11 @@ ta->tm_isdst = arguments[6]->value.lval; /* fall-through */ case 6: - ta->tm_year = arguments[5]->value.lval - ((arguments[5]->value.lval > 1000) ? 1900 : 0); + ta->tm_year = arguments[5]->value.lval; + if (ta->tm_year < 70) + ta->tm_year += 100; + else if (ta->tm_year > 1000) + ta->tm_year -= 1900; /* fall-through */ case 5: ta->tm_mday = arguments[4]->value.lval;