diff options
| author | Reeze Xia <reeze@php.net> | 2015-02-28 16:40:06 +0800 |
|---|---|---|
| committer | Reeze Xia <reeze@php.net> | 2015-02-28 16:40:06 +0800 |
| commit | 1b240ff9e3b865b14bea191b3a4394064b43e2a3 (patch) | |
| tree | 494cadd0e58f756adf09c031e96869df2b49fa35 /ext/date/php_date.c | |
| parent | b41b229d78099eaf39f09e9447caeedecf60332c (diff) | |
| parent | f824f91ac95000c7a6e60117d00088c253e16213 (diff) | |
| download | php-git-1b240ff9e3b865b14bea191b3a4394064b43e2a3.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fixed bug #69141 Missing arguments in reflection info for some builtin functions
Diffstat (limited to 'ext/date/php_date.c')
| -rw-r--r-- | ext/date/php_date.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index a3f8735433..c4495f4ae9 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -85,6 +85,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mktime, 0, 0, 0) ZEND_ARG_INFO(0, mon) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, is_dst) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) @@ -94,6 +95,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_gmmktime, 0, 0, 0) ZEND_ARG_INFO(0, mon) ZEND_ARG_INFO(0, day) ZEND_ARG_INFO(0, year) + ZEND_ARG_INFO(0, is_dst) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO(arginfo_checkdate, 0) |