diff options
| author | Xinchen Hui <laruence@php.net> | 2012-10-31 11:14:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2012-10-31 11:14:53 +0800 |
| commit | 8fb26e76ba463cfd38433bb2f19be84ff79b11b8 (patch) | |
| tree | c911dfb9a2264697628e2ac82759eff239abd61b /ext/reflection/php_reflection.c | |
| parent | 1af3d9d6c9138ff34493f5ff19908c1b60106d63 (diff) | |
| parent | 7886f46b560c51f235da35a33c8cd0e6479c9360 (diff) | |
| download | php-git-8fb26e76ba463cfd38433bb2f19be84ff79b11b8.tar.gz | |
Merge branch 'PHP-5.4'
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 deabcbe7a4..7c51cf6cca 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4473,7 +4473,7 @@ ZEND_METHOD(reflection_class, getTraitAliases) zend_trait_method_reference *cur_ref = ce->trait_aliases[i]->trait_method; if (ce->trait_aliases[i]->alias) { - method_name_len = spprintf(&method_name, 0, "%s::%s", cur_ref->class_name, cur_ref->method_name); + method_name_len = spprintf(&method_name, 0, "%s::%s", cur_ref->ce->name, cur_ref->method_name); add_assoc_stringl_ex(return_value, ce->trait_aliases[i]->alias, ce->trait_aliases[i]->alias_len + 1, method_name, method_name_len, 0); } i++; |