diff options
| author | Nikita Popov <nikic@php.net> | 2017-01-01 12:20:46 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2017-01-01 12:20:46 +0100 |
| commit | 2a340423236938b8c6962f245f0ba99a6345d2f3 (patch) | |
| tree | 4647f1f01e5632ca67039ecb8302558a3043b364 /ext/dom | |
| parent | 8467c5c9bff6f06f3aa79760fbd26684deb4bc11 (diff) | |
| parent | 3c977618e1f0a3821deeb56fc55e00fb22ed2402 (diff) | |
| download | php-git-2a340423236938b8c6962f245f0ba99a6345d2f3.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
Diffstat (limited to 'ext/dom')
| -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 9879d81c1c..97095b541d 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; } |