diff options
| author | Derick Rethans <github@derickrethans.nl> | 2012-11-13 10:10:28 +0000 |
|---|---|---|
| committer | Derick Rethans <github@derickrethans.nl> | 2012-11-13 10:10:28 +0000 |
| commit | d9aea7cd4d82fd9203d92241aa1e76aae754d94a (patch) | |
| tree | 1ceb29b5cdc0abab3293aedaea58727e17fe2837 /ext/reflection/php_reflection.c | |
| parent | db0f62349092aa462401a6a1a236c12d56d264b6 (diff) | |
| parent | 6b9df7a4542c47fa6ab615461913ccdf7cdd4e10 (diff) | |
| download | php-git-d9aea7cd4d82fd9203d92241aa1e76aae754d94a.tar.gz | |
Merge branch 'PHP-5.4' of git.php.net:/php-src into 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 7c9981924d..53b2389d63 100644 --- a/ext/reflection/php_reflection.c +++ b/ext/reflection/php_reflection.c @@ -4465,7 +4465,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++; |