From: Derick Rethans <derick@php.net>
Date: Wed, 13 Feb 2008 21:53:01 +0000 (+0000)
Subject: - Add some missing elements from the return value.
X-Git-Tag: RELEASE_2_0_0a1~485
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa93ba42ff761273d3c3e652bf0dd60000fcebd1;p=php

- Add some missing elements from the return value.
---

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 7a1daf9985..2323517c13 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -2098,7 +2098,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);
 	}
@@ -2113,7 +2113,13 @@ void php_date_do_return_parsed_time(INTERNAL_FUNCTION_PARAMETERS, timelib_time *
 	if (parsed_time->have_weekday_relative) {
 		add_ascii_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_ascii_assoc_long(element, "weekdays", parsed_time->special.amount);
+	}
+	if (parsed_time->relative.first_last_day_of) {
+		add_ascii_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_ascii_assoc_zval(return_value, "relative", element);
 	}
 	timelib_time_dtor(parsed_time);