diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-14 19:33:46 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-14 19:33:46 +0800 |
| commit | e68b851217a4bb68e5c492973d58711081f2a40c (patch) | |
| tree | 0af80d6bbd1a93b45aecf2a40b81deb074c59c17 /Zend/zend_exceptions.c | |
| parent | 26a6d707a18701a51269969ea97b8b9b4d851d8a (diff) | |
| parent | 5fc635548e30fe16b0f112e26db3a4a2dc69522c (diff) | |
| download | php-git-e68b851217a4bb68e5c492973d58711081f2a40c.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_exceptions.c
Diffstat (limited to 'Zend/zend_exceptions.c')
| -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 cda0dd943c..79b2183e3b 100644 --- a/Zend/zend_exceptions.c +++ b/Zend/zend_exceptions.c @@ -557,7 +557,7 @@ ZEND_METHOD(exception, getTraceAsString) DEFAULT_0_PARAMS; trace = zend_read_property(base_exception_ce, getThis(), "trace", sizeof("trace")-1, 1, &rv); - if(Z_TYPE_P(trace) != IS_ARRAY) { + if (Z_TYPE_P(trace) != IS_ARRAY) { RETURN_FALSE; } ZEND_HASH_FOREACH_NUM_KEY_VAL(Z_ARRVAL_P(trace), index, frame) { |