- Revert previous patch, it was correct to do this, error is logged if logging is...

diff --git a/ext/standard/html.c b/ext/standard/html.c
index 8a32b3bfd891433b05f146a06bb030dfffd7992e..fb785e42d1a4d971679db346566fdf4b5518f3ed 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -1135,7 +1135,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();
                }