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

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