diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-23 10:41:27 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-05-23 10:41:27 +0200 |
| commit | c3ee12e7868dbc08da36e780eee80a9d3c2e30d1 (patch) | |
| tree | 5b3b13a66aa54acab89246a8ae3908c021eb0cf7 /Zend/zend_inheritance.c | |
| parent | b63cb6742123e9fe125cd4bc6c7ac0bdddf0f3b2 (diff) | |
| parent | 64918c770282c0f60b407e8de3201a6b68c88e78 (diff) | |
| download | php-git-c3ee12e7868dbc08da36e780eee80a9d3c2e30d1.tar.gz | |
Merge branch 'PHP-7.4'
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index 38e5c205fb..e4292b3484 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -1961,7 +1961,7 @@ void zend_verify_abstract_class(zend_class_entry *ce) /* {{{ */ ZEND_API void zend_do_link_class(zend_class_entry *ce, zend_class_entry *parent) /* {{{ */ { - ce->ce_flags |= ZEND_ACC_LINKED; + ce->ce_flags |= ZEND_ACC_LINKING_IN_PROGRESS; if (parent) { zend_do_inheritance(ce, parent); } @@ -1976,5 +1976,7 @@ ZEND_API void zend_do_link_class(zend_class_entry *ce, zend_class_entry *parent) } zend_build_properties_info_table(ce); + ce->ce_flags &= ~ZEND_ACC_LINKING_IN_PROGRESS; + ce->ce_flags |= ZEND_ACC_LINKED; } /* }}} */ |