diff options
| author | Jani Taskinen <jani@php.net> | 2007-12-11 12:26:16 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2007-12-11 12:26:16 +0000 |
| commit | 0644aff5864bfeabb9f9a021e64f2aacdee7afc8 (patch) | |
| tree | 562142e5908820b7e4e88f7b82a152da8093ddd4 | |
| parent | 882bd652df5e7a92fabec13ec53d7037645b4f1b (diff) | |
| download | php-git-0644aff5864bfeabb9f9a021e64f2aacdee7afc8.tar.gz | |
MFH:- Revert previous patch, it was correct to do this, error is logged if logging is enabled
| -rw-r--r-- | ext/standard/html.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/standard/html.c b/ext/standard/html.c index 955d468e99..0a93757e18 100644 --- a/ext/standard/html.c +++ b/ext/standard/html.c @@ -1136,7 +1136,9 @@ PHPAPI char *php_escape_html_entities_ex(unsigned char *old, int oldlen, int *ne if(status == FAILURE) { /* invalid MB sequence */ efree(replaced); - php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid multibyte sequence in argument"); + if(!PG(display_errors)) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Invalid multibyte sequence in argument"); + } *newlen = 0; return STR_EMPTY_ALLOC(); } |