cvs: php-src(PHP_4_4) /main main.c

iliaa Mon Jan 30 15:31:10 2006 UTC Modified files: (Branch: PHP_4_4) /php-src/main main.c Log: Fixed error reporting logic for HTML errors http://cvs.php.net/viewcvs.cgi/php-src/main/main.c?r1=1.512.2.63.2.8&r2=1.512.2.63.2.9&diff_format=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.512.2.63.2.8 php-src/main/main.c:1.512.2.63.2.9 --- php-src/main/main.c:1.512.2.63.2.8 Sun Jan 1 13:46:59 2006 +++ php-src/main/main.c Mon Jan 30 15:31:10 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.512.2.63.2.8 2006/01/01 13:46:59 sniper Exp $ */ +/* $Id: main.c,v 1.512.2.63.2.9 2006/01/30 15:31:10 iliaa Exp $ */ /* {{{ includes */ @@ -496,7 +496,7 @@ } } } - if (!PG(html_errors) || !strlen(PG(docref_root))) { + if (!PG(html_errors) && !strlen(PG(docref_root))) { /* no docref and no html errors -> do not point to any documentation (e.g. production boxes) */ php_error(type, "%s(%s): %s", get_active_function_name(TSRMLS_C), params, buffer); } else if (PG(html_errors)) {