diff options
| author | Nikita Popov <nikic@php.net> | 2017-01-01 12:20:52 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2017-01-01 12:20:52 +0100 |
| commit | bf3ce4db940dc96a5ac4bae2f0d5b2a6ef8257ac (patch) | |
| tree | 514e51e6f7870f364d114707b0b469b92f466f9c /ext/dom/php_dom.c | |
| parent | 1283ea466597bebba2ee887304c4df82fd331e35 (diff) | |
| parent | 2a340423236938b8c6962f245f0ba99a6345d2f3 (diff) | |
| download | php-git-bf3ce4db940dc96a5ac4bae2f0d5b2a6ef8257ac.tar.gz | |
Merge branch 'PHP-7.1'
Diffstat (limited to 'ext/dom/php_dom.c')
| -rw-r--r-- | ext/dom/php_dom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index ef7622c893..56fa38055c 100644 --- a/ext/dom/php_dom.c +++ b/ext/dom/php_dom.c @@ -1075,7 +1075,7 @@ static dom_object* dom_objects_set_class(zend_class_entry *class_type, zend_bool dom_object *intern = ecalloc(1, sizeof(dom_object) + zend_object_properties_size(class_type)); zend_class_entry *base_class = class_type; - while (base_class->type != ZEND_INTERNAL_CLASS && base_class->parent != NULL) { + while ((base_class->type != ZEND_INTERNAL_CLASS || base_class->info.internal.module->module_number != dom_module_entry.module_number) && base_class->parent != NULL) { base_class = base_class->parent; } |