summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-05-04 10:35:55 +0800
committerXinchen Hui <laruence@php.net>2015-05-04 10:35:55 +0800
commit6b5ca7202fe95240c0ecc17861c050683547a816 (patch)
tree6b20921faf3b2f155fe948eb6d7a24775cbcd4b2
parent02110bdfaa8ecc361a612779703f45df313530b3 (diff)
downloadphp-git-6b5ca7202fe95240c0ecc17861c050683547a816.tar.gz
Fixed #69566 in master
-rw-r--r--Zend/zend_inheritance.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c
index 52f4994c7b..f32c55aaef 100644
--- a/Zend/zend_inheritance.c
+++ b/Zend/zend_inheritance.c
@@ -1135,7 +1135,7 @@ static void zend_fixup_trait_method(zend_function *fn, zend_class_entry *ce) /*
if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
ce->ce_flags |= ZEND_ACC_IMPLICIT_ABSTRACT_CLASS;
}
- if (fn->op_array.static_variables) {
+ if (fn->type == ZEND_USER_FUNCTION && fn->op_array.static_variables) {
ce->ce_flags |= ZEND_HAS_STATIC_IN_METHODS;
}
}