diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-18 16:38:51 -0400 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-03-18 16:38:51 -0400 |
| commit | 724f7118f196912a2d69a244c74dd0479e209d81 (patch) | |
| tree | 7889554c50184636a92cffd7334711767fa75690 /Zend/zend_exceptions.c | |
| parent | 1df033c5cd984157741f74908aeae171eea49380 (diff) | |
| download | php-git-724f7118f196912a2d69a244c74dd0479e209d81.tar.gz | |
Refactor error messages to only append defined in the event of rendering as a fatal error. Fix relative typehints to not work
Diffstat (limited to 'Zend/zend_exceptions.c')
| -rw-r--r-- | Zend/zend_exceptions.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c index 2a8af1bf28..46ad207087 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -909,7 +909,12 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */ zend_long line = zval_get_long(GET_PROPERTY_SILENT(&exception, "line")); zend_long code = zval_get_long(GET_PROPERTY_SILENT(&exception, "code")); - zend_error_helper(code, file->val, line, "%s", message->val); + if (ce_exception == type_exception_ce) { + zend_error_helper(code, file->val, line, "%s and defined", message->val); + } else { + zend_error_helper(code, file->val, line, "%s", message->val); + } + zend_string_release(file); zend_string_release(message); OBJ_RELEASE(ex); |