diff options
| author | Xinchen Hui <laruence@php.net> | 2015-04-10 22:50:15 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-04-10 22:50:15 +0800 |
| commit | c5903e79be5712d70de9a25e20db53c72f1abb1b (patch) | |
| tree | 244837e5d006146029a2917f45a9639a5caf499c /Zend/zend_inheritance.c | |
| parent | 94bea670de40c937d5926839d52dc262750921f4 (diff) | |
| parent | 8ebc4431208d10fd3cc57d78ed99774f99276ff8 (diff) | |
| download | php-git-c5903e79be5712d70de9a25e20db53c72f1abb1b.tar.gz | |
Merge branch 'PHP-5.6'
Conflicts:
Zend/zend_compile.c
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index e203599aea..4f31529a85 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1108,6 +1108,7 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s /* inherited members are overridden by members inserted by traits */ /* check whether the trait method fulfills the inheritance requirements */ do_inheritance_check_on_method(fn, existing_fn); + fn->common.prototype = NULL; } } |