diff options
| author | Antony Dovgal <tony2001@php.net> | 2006-10-10 12:44:02 +0000 |
|---|---|---|
| committer | Antony Dovgal <tony2001@php.net> | 2006-10-10 12:44:02 +0000 |
| commit | b4974d5e68c6354ebf7e23da9c3a6da5cb7b5456 (patch) | |
| tree | d70351826ea53be31233fac2eaa3a5658417e9ee | |
| parent | 3890ca3fcba86e1196e60320baad77086f2a4cd7 (diff) | |
| download | php-git-b4974d5e68c6354ebf7e23da9c3a6da5cb7b5456.tar.gz | |
MFH: fix #39112 (typo in error message)
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 | ||||
| -rw-r--r-- | ext/pcre/tests/preg_replace2.phpt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 0bfc13faca..b6cf8d050a 100644 --- a/ext/pcre/php_pcre.c +++ b/ext/pcre/php_pcre.c @@ -1260,7 +1260,7 @@ static void preg_replace_impl(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_callabl 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; } diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt index 80a94d8768..4e2f39f8ca 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) { |