diff options
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index fc4bb40e74..76bc91a956 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1601,7 +1601,7 @@ static void zend_do_traits_property_binding(zend_class_entry *ce) /* {{{ */ flags |= ZEND_ACC_CHANGED; } else { not_compatible = 1; - + if ((coliding_prop->flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC)) == (flags & (ZEND_ACC_PPP_MASK | ZEND_ACC_STATIC))) { /* the flags are identical, thus, the properties may be compatible */ |