diff options
| author | Hannes Magnusson <bjori@php.net> | 2006-10-08 13:34:24 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2006-10-08 13:34:24 +0000 |
| commit | 176b72284c06793e51180eca0a03af1c8691d841 (patch) | |
| tree | 917632aec222a34e274711b7bd19c4f6372187fd /ext/pcre | |
| parent | 32d1b3ad5584b76b27024df186758b94c42c721a (diff) | |
| download | php-git-176b72284c06793e51180eca0a03af1c8691d841.tar.gz | |
Error message clean up
(patch by Matt W (php_lists -AT- realpain.com))
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/php_pcre.c | 2 | ||||
| -rw-r--r-- | ext/pcre/tests/preg_replace2.phpt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ext/pcre/php_pcre.c b/ext/pcre/php_pcre.c index 00bac77193..cb49d88f89 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 in an array"); RETURN_FALSE; } diff --git a/ext/pcre/tests/preg_replace2.phpt b/ext/pcre/tests/preg_replace2.phpt index 2c076e7ebc..e2863d8ffb 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 in 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 in an array in %s on line %d bool(false) unicode(1) "c" array(3) { |