From 3edbc7b0b385079f9c7c138e99cc5724f37d1baf Mon Sep 17 00:00:00 2001 From: Derick Rethans Date: Wed, 13 Feb 2008 21:53:12 +0000 Subject: [PATCH] - MFH: Add some missing elements from the return value. --- ext/date/php_date.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 2a8c63650a..4637f35d2d 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -1973,7 +1973,7 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time * break; } } - if (parsed_time->have_relative || parsed_time->have_weekday_relative) { + if (parsed_time->have_relative || parsed_time->have_weekday_relative || parsed_time->have_special_relative || parsed_time->relative.first_last_day_of) { MAKE_STD_ZVAL(element); array_init(element); } @@ -1988,7 +1988,13 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time * if (parsed_time->have_weekday_relative) { add_assoc_long(element, "weekday", parsed_time->relative.weekday); } - if (parsed_time->have_relative || parsed_time->have_weekday_relative) { + if (parsed_time->have_special_relative && (parsed_time->special.type == TIMELIB_SPECIAL_WEEKDAY)) { + add_assoc_long(element, "weekdays", parsed_time->special.amount); + } + if (parsed_time->relative.first_last_day_of) { + add_assoc_bool(element, parsed_time->relative.first_last_day_of == 1 ? "first_day_of_month" : "last_day_of_month", 1); + } + if (parsed_time->have_relative || parsed_time->have_weekday_relative || parsed_time->have_special_relative || parsed_time->relative.first_last_day_of) { add_assoc_zval(return_value, "relative", element); } timelib_time_dtor(parsed_time); -- 2.40.0