tony2001 Tue Oct 10 12:44:02 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre php_pcre.c
/php-src/ext/pcre/tests preg_replace2.phpt
Log:
MFH: fix #39112 (typo in error message)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.11&r2=1.168.2.9.2.12&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.11
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.12
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.11 Wed Sep 6 16:30:59 2006
+++ php-src/ext/pcre/php_pcre.c Tue Oct 10 12:44:02 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.11 2006/09/06 16:30:59 nlopess Exp $ */
+/* $Id: php_pcre.c,v 1.168.2.9.2.12 2006/10/10 12:44:02 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1260,7 +1260,7 @@
WRONG_PARAM_COUNT;
}
if (!is_callable_replace && Z_TYPE_PP(replace) == IS_ARRAY &&
Z_TYPE_PP(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.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/pcre/tests/preg_replace2.phpt
diff -u php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.1
php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.2
--- php-src/ext/pcre/tests/preg_replace2.phpt:1.1.2.1 Mon Jul 17 11:39:13 2006
+++ php-src/ext/pcre/tests/preg_replace2.phpt Tue Oct 10 12:44:02 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) {
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
