diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-14 19:32:28 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-14 19:32:28 +0800 |
| commit | 5fc635548e30fe16b0f112e26db3a4a2dc69522c (patch) | |
| tree | 47a2ba11097cb98987d5b4e1bcc38f8b1734f7f7 | |
| parent | d887ef5a045f4f43b24fdb8af25bee6309fbcb8a (diff) | |
| parent | 4b27569dc3c684bf1d936cf4373d6aab1affca84 (diff) | |
| download | php-git-5fc635548e30fe16b0f112e26db3a4a2dc69522c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
| -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 f163495906..3e50422e4b 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -591,7 +591,7 @@ ZEND_METHOD(exception, getTraceAsString) str = &res; trace = zend_read_property(default_exception_ce, getThis(), "trace", sizeof("trace")-1, 1 TSRMLS_CC); - if(Z_TYPE_P(trace) != IS_ARRAY) { + if (Z_TYPE_P(trace) != IS_ARRAY) { RETURN_FALSE; } zend_hash_apply_with_arguments(Z_ARRVAL_P(trace) TSRMLS_CC, (apply_func_args_t)_build_trace_string, 3, str, len, &num); |