svn: /php/php-src/branches/PHP_5_3_1/ext/pcre/ php_pcre.c
| From: | Pierre-Alain Joye | Date: | Fri, 09 Oct 2009 14:25:51 +0000 |
| Subject: | svn: /php/php-src/branches/PHP_5_3_1/ext/pcre/ php_pcre.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-60615@lists.php.net to get a copy of this message | ||
pajoye Fri, 09 Oct 2009 14:25:51 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=289418
Log:
- Merge: Fixed bug #49483 (preg_replace 'subject' parameter listed as optional)
Bug: http://bugs.php.net/49483 (Closed) preg_replace
'subject' parameter listed as optional
Changed paths:
U php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c
Modified: php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c
===================================================================
--- php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c 2009-10-09 14:22:29 UTC (rev 289417)
+++ php/php-src/branches/PHP_5_3_1/ext/pcre/php_pcre.c 2009-10-09 14:25:51 UTC (rev 289418)
@@ -1836,7 +1836,7 @@
ZEND_ARG_INFO(0, offset)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 2)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_preg_replace, 0, 0, 3)
ZEND_ARG_INFO(0, regex)
ZEND_ARG_INFO(0, replace)
ZEND_ARG_INFO(0, subject)