diff options
| author | Felipe Pena <felipe@php.net> | 2008-03-08 21:54:03 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2008-03-08 21:54:03 +0000 |
| commit | fd0d44f0a78bf528cc780b1fd5036e390de19a22 (patch) | |
| tree | 0c97f29c12921b933075b398e2ae3dc268570d71 /Zend/zend.c | |
| parent | 2801e87a553bc92a3bec4aa32de56e8e6644ce70 (diff) | |
| download | php-git-fd0d44f0a78bf528cc780b1fd5036e390de19a22.tar.gz | |
User error handlers no longer catch supressed errors (patch by Etienne Kneuss)
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 95e8ad5f55..b0a8b27255 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -1006,7 +1006,8 @@ ZEND_API void zend_error(int type, const char *format, ...) /* {{{ */ /* if we don't have a user defined error handler */ if (!EG(user_error_handler) - || !(EG(user_error_handler_error_reporting) & type)) { + || !(EG(user_error_handler_error_reporting) & type) + || EG(error_handling) != EH_NORMAL) { zend_error_cb(type, error_filename, error_lineno, format, args); } else switch (type) { case E_ERROR: |