cvs: php-src /ext/pcre php_pcre.c /ext/pcre/tests preg_replace2.phpt

From: Date: Tue, 10 Oct 2006 12:43:34 +0000
Subject: cvs: php-src /ext/pcre php_pcre.c /ext/pcre/tests preg_replace2.phpt
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-41040@lists.php.net to get a copy of this message
tony2001 Tue Oct 10 12:43:34 2006 UTC Modified files: /php-src/ext/pcre php_pcre.c /php-src/ext/pcre/tests preg_replace2.phpt Log: fix #39112 (typo in error message) http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.208&r2=1.209&diff_format=u Index: php-src/ext/pcre/php_pcre.c diff -u php-src/ext/pcre/php_pcre.c:1.208 php-src/ext/pcre/php_pcre.c:1.209 --- php-src/ext/pcre/php_pcre.c:1.208 Mon Oct 9 19:54:38 2006 +++ php-src/ext/pcre/php_pcre.c Tue Oct 10 12:43:34 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_pcre.c,v 1.208 2006/10/09 19:54:38 andrei Exp $ */ +/* $Id: php_pcre.c,v 1.209 2006/10/10 12:43:34 tony2001 Exp $ */ /* TODO * php_pcre_replace_impl(): @@ -1373,7 +1373,7 @@ } if (!is_callable_replace && Z_TYPE_P(replace) == IS_ARRAY && Z_TYPE_P(regex) != IS_ARRAY) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter mismatch, pattern is a string while replacement in an array"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Parameter mismatch, pattern is a string while replacement is an array"); RETURN_FALSE; } http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/tests/preg_replace2.phpt?r1=1.4&r2=1.5&diff_format=u Index: php-src/ext/pcre/tests/preg_replace2.phpt diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.4 php-src/ext/pcre/tests/preg_replace2.phpt:1.5 --- php-src/ext/pcre/tests/preg_replace2.phpt:1.4 Sun Oct 8 13:34:23 2006 +++ php-src/ext/pcre/tests/preg_replace2.phpt Tue Oct 10 12:43:34 2006 @@ -16,7 +16,7 @@ ?> --EXPECTF-- -Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement in an array in %spreg_replace2.php on line 3 +Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %spreg_replace2.php on line 3 bool(false) string(1) "c" array(3) { @@ -41,7 +41,7 @@ } ==done== --UEXPECTF-- -Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement in an array in %s on line %d +Warning: preg_replace(): Parameter mismatch, pattern is a string while replacement is an array in %s on line %d bool(false) unicode(1) "c" array(3) {

« previous php.cvs (#41040) next »