diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-11-13 10:10:28 +0000 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-11-13 10:10:28 +0000 |
| commit | d9aea7cd4d82fd9203d92241aa1e76aae754d94a (patch) | |
| tree | 1ceb29b5cdc0abab3293aedaea58727e17fe2837 /ext/pcre/php_pcre.c | |
| parent | db0f62349092aa462401a6a1a236c12d56d264b6 (diff) | |
| parent | 6b9df7a4542c47fa6ab615461913ccdf7cdd4e10 (diff) | |
| download | php-git-d9aea7cd4d82fd9203d92241aa1e76aae754d94a.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -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 */ |