From d288f66c7cc2ff00fffaea78fa8ee184e2c4652b Mon Sep 17 00:00:00 2001
From: Andrei Zmievski <andrei@php.net>
Date: Thu, 6 Apr 2006 21:10:45 +0000
Subject: Fix a bug that would not fill in the fifth argument to preg_replace()
 properly, if the variable was not declared previously.

---
 ext/pcre/php_pcre.c | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'ext/pcre/php_pcre.c')

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)
-- 
cgit v1.2.1