From: Xinchen Hui Date: Mon, 4 May 2015 02:35:55 +0000 (+0800) Subject: Fixed #69566 in master X-Git-Tag: PRE_PHP7_NSAPI_REMOVAL~107 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6b5ca7202fe95240c0ecc17861c050683547a816;p=php Fixed #69566 in master --- 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; } }