diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-25 11:00:35 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-01-25 11:01:06 +0100 |
| commit | f78e681428a368930860162a1ea9b23b1a07666f (patch) | |
| tree | c29babde9ab05af26017d09507e4175aa97250f3 /Zend/zend_inheritance.c | |
| parent | 3c98c2d0cbf476432a4fa6264afc5e43c58fb38f (diff) | |
| download | php-git-f78e681428a368930860162a1ea9b23b1a07666f.tar.gz | |
Fixed bug #77498
I've renamed the function to the same name as the exported symbol
in master.
Diffstat (limited to 'Zend/zend_inheritance.c')
| -rw-r--r-- | Zend/zend_inheritance.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Zend/zend_inheritance.c b/Zend/zend_inheritance.c index f3b62ef7e5..eed2074729 100644 --- a/Zend/zend_inheritance.c +++ b/Zend/zend_inheritance.c @@ -894,6 +894,9 @@ ZEND_API void zend_do_inheritance(zend_class_entry *ce, zend_class_entry *parent } if (UNEXPECTED(parent_ce->type != ce->type)) { /* User class extends internal */ + if (CE_STATIC_MEMBERS(parent_ce) == NULL) { + zend_class_init_statics(parent_ce); + } if (UNEXPECTED(zend_update_class_constants(parent_ce) != SUCCESS)) { ZEND_ASSERT(0); } |