diff options
| author | Adam Harvey <aharvey@php.net> | 2012-11-12 20:08:01 +0800 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2012-11-12 20:08:01 +0800 |
| commit | 6b9df7a4542c47fa6ab615461913ccdf7cdd4e10 (patch) | |
| tree | 00b047fe356b925519daadf8e3129ac5919900d3 | |
| parent | 5b82fb52fd5143a3860db219eb39616c6e642a4b (diff) | |
| parent | bca8ff723d1d2721e410ecdf10955aea57445a19 (diff) | |
| download | php-git-6b9df7a4542c47fa6ab615461913ccdf7cdd4e10.tar.gz | |
Merge branch 'preg_match_all_arginfo' into PHP-5.4
* preg_match_all_arginfo:
Update arginfo for preg_match_all() to reflect reality.
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 2f892c8e94..b18c9edc7f 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1866,7 +1866,7 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match, 0, 0, 2) ZEND_ARG_INFO(0, offset) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 3) +ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_match_all, 0, 0, 2) ZEND_ARG_INFO(0, pattern) ZEND_ARG_INFO(0, subject) ZEND_ARG_INFO(1, subpatterns) /* array */ |