cvs: php-src(PHP_5_3) /ext/standard html.c

jani Tue Dec 11 12:26:43 2007 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/standard html.c Log: MFH:- Revert previous patch, it was correct to do this, error is logged if logging is enabled http://cvs.php.net/viewvc.cgi/php-src/ext/standard/html.c?r1=1.111.2.2.2.14.2.3&r2=1.111.2.2.2.14.2.4&diff_format=u Index: php-src/ext/standard/html.c diff -u php-src/ext/standard/html.c:1.111.2.2.2.14.2.3 php-src/ext/standard/html.c:1.111.2.2.2.14.2.4 --- php-src/ext/standard/html.c:1.111.2.2.2.14.2.3 Tue Dec 11 11:29:09 2007 +++ php-src/ext/standard/html.c Tue Dec 11 12:26:43 2007 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: html.c,v 1.111.2.2.2.14.2.3 2007/12/11 11:29:09 jani Exp $ */ +/* $Id: html.c,v 1.111.2.2.2.14.2.4 2007/12/11 12:26:43 jani Exp $ */ /* * HTML entity resources: @@ -1132,7 +1132,9 @@ 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(); }