From 31123e33b30c8e688c94ed6cf4bbe0d326f10b01 Mon Sep 17 00:00:00 2001 From: Antony Dovgal Date: Mon, 27 Mar 2006 22:07:50 +0000 Subject: [PATCH] MF51: fix #36878 (error messages are printed even though an exception has been thrown) --- Zend/zend.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend.c b/Zend/zend.c index 695fe6bc56..41662a39a9 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1474,7 +1474,7 @@ ZEND_API void zend_error(int type, const char *format, ...) } zval_ptr_dtor(&retval); } - } else { + } else if (!EG(exception)) { /* The user error handler failed, use built-in error handler */ zend_error_cb(type, error_filename, error_lineno, format, args); } -- 2.50.1