diff options
| author | Nikita Popov <nikic@php.net> | 2015-05-15 21:04:07 +0200 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-05-15 23:40:32 +0200 |
| commit | c9f27ee4227268bc74fc54e0e06102317e614804 (patch) | |
| tree | 35680688ecebfd7bc1321f21a6919133dffa666f /Zend/zend_exceptions.c | |
| parent | 34e6fbbfed6bd63e7f71ca61ff73ca67d0c12b7b (diff) | |
| download | php-git-c9f27ee4227268bc74fc54e0e06102317e614804.tar.gz | |
Display EngineExceptions like ordinary exceptions
TypeException stays as-is for now because it uses messages that are
incompatible with the way exception messages are displayed.
closure_038.phpt and a few others now show that we're generating
too many exceptions for compound operations on undefined properties
-- this needs to be fixed in a followup.
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index cb8b79ece9..671c09cd60 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -908,7 +908,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ ZVAL_OBJ(&exception, ex); ce_exception = Z_OBJCE(exception); EG(exception) = NULL; - if (ce_exception == parse_exception_ce || ce_exception == engine_exception_ce || ce_exception == type_exception_ce) { + if (ce_exception == parse_exception_ce || ce_exception == type_exception_ce) { zend_string *message = zval_get_string(GET_PROPERTY(&exception, "message")); zend_string *file = zval_get_string(GET_PROPERTY_SILENT(&exception, "file")); zend_long line = zval_get_long(GET_PROPERTY_SILENT(&exception, "line")); |