diff options
| author | Xinchen Hui <laruence@php.net> | 2013-03-09 23:08:14 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2013-03-09 23:08:14 +0800 |
| commit | 7197f0ffccea7f195bc28571e30c389eadda874b (patch) | |
| tree | aaf1095aed2900460c5aa0eaced3b4ede26bec69 /Zend/zend_interfaces.c | |
| parent | f52b2e6a6572018eb61ad830206ed172b033232a (diff) | |
| download | php-git-7197f0ffccea7f195bc28571e30c389eadda874b.tar.gz | |
Fixed confused exception message while user threw exception
Diffstat (limited to 'Zend/zend_interfaces.c')
| -rw-r--r-- | Zend/zend_interfaces.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_interfaces.c b/Zend/zend_interfaces.c index 384b66da4b..e2e81ed326 100644 --- a/Zend/zend_interfaces.c +++ b/Zend/zend_interfaces.c @@ -452,7 +452,7 @@ ZEND_API int zend_user_serialize(zval *object, unsigned char **buffer, zend_uint zval_ptr_dtor(&retval); } - if (result == FAILURE) { + if (result == FAILURE && !EG(exception)) { zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "%s::serialize() must return a string or NULL", ce->name); } return result; |