diff options
| author | Julien Pauli <jpauli@php.net> | 2015-01-09 16:24:32 +0100 |
|---|---|---|
| committer | Julien Pauli <jpauli@php.net> | 2015-01-09 16:24:32 +0100 |
| commit | 138b6442d44c00c7a6c60fe7043ca6b202b7ce51 (patch) | |
| tree | 3301ef982bd7ea20848699ce79ad576d1b694656 /ext/sqlite3/sqlite3.c | |
| parent | 0547edb5c239a8cbfb7a1d16d85ee365480527dd (diff) | |
| parent | dc810543cfaedd659a81507887e242a3680d5883 (diff) | |
| download | php-git-138b6442d44c00c7a6c60fe7043ca6b202b7ce51.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
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 33c855facf..1111abdc16 100644 --- a/ext/sqlite3/sqlite3.c +++ b/ext/sqlite3/sqlite3.c @@ -1924,7 +1924,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() |