diff options
author | Julien Pauli <jpauli@php.net> | 2015-01-09 16:25:14 +0100 |
---|---|---|
committer | Julien Pauli <jpauli@php.net> | 2015-01-09 16:25:14 +0100 |
commit | fb069be475c9bf71d53f17de88b76144845ca50d (patch) | |
tree | 17a0117e6b2298c451dabc4edb7468e2f640bb59 /ext/sqlite3/sqlite3.c | |
parent | d51fb69c0125a144cacb8c59df89fea3f8ae7f4b (diff) | |
parent | 287217a3a34f0bc0e0d0f278f9915bf5163c6044 (diff) | |
download | php-git-fb069be475c9bf71d53f17de88b76144845ca50d.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
Updated NEWS
Fix bug #68260
Diffstat (limited to 'ext/sqlite3/sqlite3.c')
-rw-r--r-- | ext/sqlite3/sqlite3.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c index ef823d9feb..76d42de9d5 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1888,7 +1888,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_columntype, 0, 0, 1) ZEND_ARG_INFO(0, column_number) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_fetcharray, 0, 0, 1) +ZEND_BEGIN_ARG_INFO_EX(arginfo_sqlite3result_fetcharray, 0, 0, 0) ZEND_ARG_INFO(0, mode) ZEND_END_ARG_INFO() |