diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-21 11:14:36 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-03-21 11:14:36 +0800 |
| commit | b29a9fa75d12c781495fdc271c5ed14901464898 (patch) | |
| tree | d3fc24f48bcceeacf6366559af483d4332f4a292 | |
| parent | da6916a770b7be6e029579a1d34302b5d2112ece (diff) | |
| parent | 0fd3572f4edbe7b3d9efdd212e214a9052dcfd01 (diff) | |
| download | php-git-b29a9fa75d12c781495fdc271c5ed14901464898.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
| -rw-r--r-- | ext/standard/string.c | 4 | ||||
| -rw-r--r-- | ext/standard/tests/strings/stristr_error.phpt | 4 | ||||
| -rw-r--r-- | ext/standard/tests/strings/strstr.phpt | bin | 10539 -> 10530 bytes |
3 files changed, 4 insertions, 4 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index e245ce3fb6..f3f78100b4 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -1715,7 +1715,7 @@ PHP_FUNCTION(stristr) if (Z_TYPE_P(needle) == IS_STRING) { char *orig_needle; if (!Z_STRLEN_P(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle"); efree(haystack_dup); RETURN_FALSE; } @@ -1765,7 +1765,7 @@ PHP_FUNCTION(strstr) if (Z_TYPE_P(needle) == IS_STRING) { if (!Z_STRLEN_P(needle)) { - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty delimiter"); + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Empty needle"); RETURN_FALSE; } diff --git a/ext/standard/tests/strings/stristr_error.phpt b/ext/standard/tests/strings/stristr_error.phpt index 831d93f4ec..2da35de735 100644 --- a/ext/standard/tests/strings/stristr_error.phpt +++ b/ext/standard/tests/strings/stristr_error.phpt @@ -50,11 +50,11 @@ NULL -- Testing stristr() function with empty haystack -- -Warning: stristr(): Empty delimiter in %s on line %d +Warning: stristr(): Empty needle in %s on line %d bool(false) -- Testing stristr() function with empty needle -- -Warning: stristr(): Empty delimiter in %s on line %d +Warning: stristr(): Empty needle in %s on line %d bool(false) ===DONE=== diff --git a/ext/standard/tests/strings/strstr.phpt b/ext/standard/tests/strings/strstr.phpt Binary files differindex 1c8d753e65..b135258f88 100644 --- a/ext/standard/tests/strings/strstr.phpt +++ b/ext/standard/tests/strings/strstr.phpt |