]> granicus.if.org Git - php/commitdiff
Fixed #69566 in master
authorXinchen Hui <laruence@php.net>
Mon, 4 May 2015 02:35:55 +0000 (10:35 +0800)
committerXinchen Hui <laruence@php.net>
Mon, 4 May 2015 02:35:55 +0000 (10:35 +0800)
Zend/zend_inheritance.c

index 52f4994c7b76da268ef2261f4c164ffc5764d1ce..f32c55aaef6fb12280dc3b9ddf5b8b857dbb3887 100644 (file)
@@ -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;
                }
        }