From: Andrei Zmievski <andrei@php.net>
Date: Fri, 28 May 2004 17:28:33 +0000 (+0000)
Subject: Allow user-defined error handlers to indicate whether default error
X-Git-Tag: php-5.0.0RC3RC2~75
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=915a990330b254b1c88662e3e3f751b065095d1e;p=php

Allow user-defined error handlers to indicate whether default error
handler should be re-invoked, by returning true or false.
---

diff --git a/Zend/zend.c b/Zend/zend.c
index 8e928fb996..b637538c5a 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -974,6 +974,9 @@ ZEND_API void zend_error(int type, const char *format, ...)
 
 			if (call_user_function_ex(CG(function_table), NULL, orig_user_error_handler, &retval, 5, params, 1, NULL TSRMLS_CC)==SUCCESS) {
 				if (retval) {
+					if (Z_TYPE_P(retval) != IS_NULL && !zend_is_true(retval)) {
+						zend_error_cb(type, error_filename, error_lineno, format, args);
+					}
 					zval_ptr_dtor(&retval);
 				}
 			} else {