From: Aaron Piotrowski <aaron@trowski.com>
Date: Mon, 15 Jun 2015 22:35:24 +0000 (-0500)
Subject: Check for zend_ce_throwable instead
X-Git-Tag: php-7.0.0alpha2~2^2~95^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0265cf5aeb99b48e07ffa4d5a2a340d4545952a1;p=php

Check for zend_ce_throwable instead
---

diff --git a/Zend/zend_exceptions.c b/Zend/zend_exceptions.c
index 1443afc3a2..08342e9050 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;