- If user error handler returns "false" then we relay to the built in error

  handler

diff --git a/Zend/zend.c b/Zend/zend.c
index b637538c5a6aa08e2a88a76a38340884b2c40059..377ab99801c587cd7797d9b19f8bc95b30429aaf 100644 (file)
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -974,7 +974,7 @@ 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)) {
+                                       if (Z_TYPE_P(retval) == IS_BOOL && Z_LVAL_P(retval) == 0) {
                                                zend_error_cb(type, error_filename, error_lineno, format, args);
                                        }
                                        zval_ptr_dtor(&retval);