From: Jani Taskinen <jani@php.net>
Date: Tue, 11 Dec 2007 12:26:16 +0000 (+0000)
Subject: MFH:- Revert previous patch, it was correct to do this, error is logged if logging... 
X-Git-Tag: php-5.2.6RC1~253
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0644aff5864bfeabb9f9a021e64f2aacdee7afc8;p=php

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

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();
 		}