com php-src: Check for zend_ce_throwable instead: Zen d/zend_exceptions.c
| From: | Anatol Belski | Date: | Mon, 15 Jun 2015 22:35:24 +0000 |
| Subject: | com php-src: Check for zend_ce_throwable instead: Zen d/zend_exceptions.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87321@lists.php.net to get a copy of this message | ||
Commit: 0265cf5aeb99b48e07ffa4d5a2a340d4545952a1
Author: Aaron Piotrowski <aaron@trowski.com> Mon, 15 Jun 2015 17:35:24 -0500
Parents: 77cf6d81b46ef1378c9b431c17566c65deb7b79b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0265cf5aeb99b48e07ffa4d5a2a340d4545952a1
Log:
Check for zend_ce_throwable instead
Changed paths:
M Zend/zend_exceptions.c
Diff:
diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 1443afc..08342e9 100644
--- a/Zend/zend_exceptions.c
+++ b/Zend/zend_exceptions.c
@@ -926,7 +926,7 @@ ZEND_API void zend_exception_error(zend_object *ex, int severity) /* {{{ */
zend_string_release(file);
zend_string_release(message);
- } else if (instanceof_function(ce_exception, default_exception_ce) ||
instanceof_function(ce_exception, error_ce)) {
+ } else if (instanceof_function(ce_exception, zend_ce_throwable)) {
zval tmp, rv;
zend_string *str, *file = NULL;
zend_long line = 0;