From: Jani Taskinen <jani@php.net>
Date: Tue, 11 Dec 2007 12:25:52 +0000 (+0000)
Subject: - Revert previous patch, it was correct to do this, error is logged if logging is... 
X-Git-Tag: RELEASE_2_0_0a1~1210
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=80518808e7449f07ae89784632fd9c849223e649;p=php

- 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 8a32b3bfd8..fb785e42d1 100644
--- 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();
 		}