From: Antony Dovgal Date: Tue, 10 Oct 2006 12:43:34 +0000 (+0000) Subject: fix #39112 (typo in error message) X-Git-Tag: RELEASE_1_0_0RC1~1326 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3049d59cba4ec73681141632ae2e7728c92f5fbe;p=php fix #39112 (typo in error message) --- diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index b3c9bf13e2..db2d334efd 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1373,7 +1373,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_callabl } 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; } diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt index e2863d8ffb..aa908d709c 100644 --- a/ext/pcre/tests/preg_replace2.phpt +++ b/ext/pcre/tests/preg_replace2.phpt @@ -16,7 +16,7 @@ echo "==done==\n"; ?> --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 @@ array(2) { } ==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) {