mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-01-27 14:13:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Fix easter_(days|date)()s first parameter now really defaults to the current

Browse Source 
year if ommited (it was document but didn't work).
This commit is contained in:
Markus Fischer 2002-06-10 07:51:28 +00:00
parent 7f4c12b006
commit 3856c3ff39
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/calendar/easter.c
View File

@ -33,8 +33,17 @@ static void _cal_easter(INTERNAL_FUNCTION_PARAMETERS, int gm)
long year, golden, solar, lunar, pfm, dom, tmp, easter;
long method = CAL_EASTER_DEFAULT;
/* Default to the current year if year parameter is not given */
{
time_t a;
struct tm b;
time(&a);
php_localtime_r(&a, &b);
year = 1900 + b.tm_year;
}
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
"l|l", &year, &method) == FAILURE) {
"|ll", &year, &method) == FAILURE) {
return;
}
@ -116,7 +125,7 @@ PHP_FUNCTION(easter_date)
}
/* }}} */
/* {{{ proto int easter_days([int year])
/* {{{ proto int easter_days([int year, [int method]])
Return the number of days after March 21 that Easter falls on for a given year (defaults to current year) */
PHP_FUNCTION(easter_days)
{