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

  year if ommited (it was document but didn't work).

diff --git a/ext/calendar/easter.c b/ext/calendar/easter.c
index 10d8ae401ea4b38849171eca09f49ace2b8bc059..d3f5c574806e18323577ac9371a781bb8c0a6071 100644 (file)
--- a/ext/calendar/easter.c
+++ b/ext/calendar/easter.c
@@ -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)
 {