summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeev Suraski <zeev@php.net>2004-01-15 16:47:32 +0000
committerZeev Suraski <zeev@php.net>2004-01-15 16:47:32 +0000
commit32007b19d8d9d4fc05310b6cf3200bad40618f21 (patch)
treea66ab4b995c5110cda9613701dbc9dbaf7560e76
parent649b844c3c7603fae30d8bfb6e28e30488f3f6ca (diff)
downloadphp-git-32007b19d8d9d4fc05310b6cf3200bad40618f21.tar.gz
Nice patch Christian, but it wasn't at all enabled? :)
Fix bug #26883
-rw-r--r--Zend/zend.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c
index 44cbbb55c0..9d4bcc283b 100644
--- a/Zend/zend.c
+++ b/Zend/zend.c
@@ -909,7 +909,8 @@ ZEND_API void zend_error(int type, const char *format, ...)
va_start(args, format);
/* if we don't have a user defined error handler */
- if (!EG(user_error_handler)) {
+ if (!EG(user_error_handler)
+ || !(EG(user_error_handler_error_reporting) & type)) {
zend_error_cb(type, error_filename, error_lineno, format, args);
} else switch (type) {
case E_ERROR: