diff options
| author | Anthony Ferrara <ircmaxell@gmail.com> | 2015-02-20 13:33:35 -0500 |
|---|---|---|
| committer | Anthony Ferrara <ircmaxell@gmail.com> | 2015-02-20 13:33:35 -0500 |
| commit | dc35868a7746b9ccca96a80c96706333f2b3951d (patch) | |
| tree | 9ff8ed600299337a350477dc7699f604c7f66a92 /Zend/zend_API.c | |
| parent | c8590799622ddb801360664d08ac5d7f4fa342df (diff) | |
| parent | e142e31137a85885f0cec83fe0aab1874846a077 (diff) | |
| download | php-git-dc35868a7746b9ccca96a80c96706333f2b3951d.tar.gz | |
Merge branch 'master' into scalar_type_hints_v5
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index 4765ef190c..18d0c672b1 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3938,7 +3938,7 @@ ZEND_API zend_string *zend_resolve_method_name(zend_class_entry *ce, zend_functi zend_string *name; if (f->common.type != ZEND_USER_FUNCTION || - *(f->op_array.refcount) < 2 || + (f->op_array.refcount && *(f->op_array.refcount) < 2) || !f->common.scope || !f->common.scope->trait_aliases) { return f->common.function_name; |