com php-src: Merge branch 'PHP-5.6': ext/date/lib/parse_date .c ext/date/lib/parse_date.re ext/date/lib/timelib. h ext/date/lib/tm2unixtime.c
ext/date/php_date.c
| From: | Derick Rethans | Date: | Tue, 31 Mar 2015 15:36:51 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/date/lib/parse_date .c ext/date/lib/parse_date.re ext/date/lib/timelib. h ext/date/lib/tm2unixtime.c ext/date/php_date.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-85973@lists.php.net to get a copy of this message | ||
Commit: d252c9f8324a1fac35aac01b7de7cc800ea76865
Author: Derick Rethans <github@derickrethans.nl> Tue, 31 Mar 2015 16:36:51 +0100
Parents: 1737e44dec534d8bbbe5f8e5beefe6edc780ff10 2d3868984cc0c43dd66f5aa0d2e56a92821300a6
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d252c9f8324a1fac35aac01b7de7cc800ea76865
Log:
Merge branch 'PHP-5.6'
Conflicts:
ext/date/lib/parse_date.c
ext/date/php_date.c
Changed paths:
MM ext/date/lib/parse_date.c
MM ext/date/lib/parse_date.re
MM ext/date/lib/timelib..h
MM ext/date/lib/tm2unixtime.c
MM ext/date/php_date.c
Diff:
diff --cc ext/date/php_date.c
index 94d3a19,c892c86..b3f6a27
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@@ -2953,26 -3035,27 +2953,26 @@@ void php_date_do_return_parsed_time(INT
}
}
if (parsed_time->have_relative) {
- MAKE_STD_ZVAL(element);
- array_init(element);
- add_assoc_long(element, "year", parsed_time->relative.y);
- add_assoc_long(element, "month", parsed_time->relative.m);
- add_assoc_long(element, "day", parsed_time->relative.d);
- add_assoc_long(element, "hour", parsed_time->relative.h);
- add_assoc_long(element, "minute", parsed_time->relative.i);
- add_assoc_long(element, "second", parsed_time->relative.s);
+ array_init(&element);
+ add_assoc_long(&element, "year", parsed_time->relative.y);
+ add_assoc_long(&element, "month", parsed_time->relative.m);
+ add_assoc_long(&element, "day", parsed_time->relative.d);
+ add_assoc_long(&element, "hour", parsed_time->relative.h);
+ add_assoc_long(&element, "minute", parsed_time->relative.i);
+ add_assoc_long(&element, "second", parsed_time->relative.s);
if (parsed_time->relative.have_weekday_relative) {
- add_assoc_long(element, "weekday", parsed_time->relative.weekday);
+ add_assoc_long(&element, "weekday", parsed_time->relative.weekday);
}
if (parsed_time->relative.have_special_relative &&
(parsed_time->relative.special.type == TIMELIB_SPECIAL_WEEKDAY)) {
- add_assoc_long(element, "weekdays", parsed_time->relative.special.amount);
+ add_assoc_long(&element, "weekdays", parsed_time->relative.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);
- add_assoc_bool(element, parsed_time->relative.first_last_day_of ==
TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month",
1);
++ add_assoc_bool(&element, parsed_time->relative.first_last_day_of ==
TIMELIB_SPECIAL_FIRST_DAY_OF_MONTH ? "first_day_of_month" : "last_day_of_month",
1);
}
- add_assoc_zval(return_value, "relative", element);
+ add_assoc_zval(return_value, "relative", &element);
}
timelib_time_dtor(parsed_time);
-}
+} /* }}} */
/* {{{ proto array date_parse(string date)
Returns associative array with detailed info about given date