diff options
| author | Xinchen Hui <laruence@gmail.com> | 2016-01-21 13:32:08 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2016-01-21 13:32:08 +0800 |
| commit | 62f3e5adf88ded51a0112977ff2a269bea58d44d (patch) | |
| tree | 2495016ed4891e9d3eabb9b1cf2621a1740e25f9 /ext/reflection/php_reflection.c | |
| parent | 62c1c11ad34103729988df9edea343337a900ba9 (diff) | |
| parent | 50c255d16c58b4957077fd243c2768090c53e6ca (diff) | |
| download | php-git-62f3e5adf88ded51a0112977ff2a269bea58d44d.tar.gz | |
Merge branch 'master' of git.php.net:/php-src
* 'master' of git.php.net:/php-src:
re-arrange NEWS
5.6.19 will be next
Fix test when run with openssl < 1.0.2 (reorder so no more SSLv2 message) Fix skip message to work
fix ReflectionClass::__toString doc block omitted
fix ReflectionClass::__toString doc block omitted
improve fix for bug #71201
improve fix for bug #71201
Diffstat (limited to 'ext/reflection/php_reflection.c')
| -rw-r--r-- | ext/reflection/php_reflection.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c index 7713137e89..461104f394 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -386,7 +386,7 @@ static void _class_string(string *str, zend_class_entry *ce, zval *obj, char *in /* TBD: Repair indenting of doc comment (or is this to be done in the parser?) */ if (ce->type == ZEND_USER_CLASS && ce->info.user.doc_comment) { - string_printf(str, "%s%s", indent, ce->info.user.doc_comment); + string_printf(str, "%s%s", indent, ZSTR_VAL(ce->info.user.doc_comment)); string_write(str, "\n", 1); } |