diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-04-06 21:10:45 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-04-06 21:10:45 +0000 |
| commit | d288f66c7cc2ff00fffaea78fa8ee184e2c4652b (patch) | |
| tree | c9118926a5d84c68d429bc320a1f454fbad11b79 /ext/pcre/php_pcre.c | |
| parent | ad7768ee63d8273d58f0d81222f38a0aa4c1236b (diff) | |
| download | php-git-d288f66c7cc2ff00fffaea78fa8ee184e2c4652b.tar.gz | |
Fix a bug that would not fill in the fifth argument to preg_replace()
properly, if the variable was not declared previously.
Diffstat (limited to 'ext/pcre/php_pcre.c')
| -rw-r--r-- | ext/pcre/php_pcre.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 557898abf3..6cd6d27a29 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -18,13 +18,6 @@ /* $Id$ */ -/* - * TODO - * - * - Allow NULL for $matches argument (helps when using preg_match only for - * match condition) - */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -1622,8 +1615,8 @@ PHP_FUNCTION(preg_grep) zend_function_entry pcre_functions[] = { PHP_FE(preg_match, third_arg_force_ref) PHP_FE(preg_match_all, third_arg_force_ref) - PHP_FE(preg_replace, NULL) - PHP_FE(preg_replace_callback, NULL) + PHP_FE(preg_replace, fifth_arg_force_ref) + PHP_FE(preg_replace_callback, fifth_arg_force_ref) PHP_FE(preg_split, NULL) PHP_FE(preg_quote, NULL) PHP_FE(preg_grep, NULL) |