com php-src: Revert "Merge branch 'PHP-7.1'": ext/dom/php_dom .c

Commit: f2eeb47797ff5120413388e7d0f00ea4c8a6b73d Author: Joe Watkins <krakjoe@php.net> Sun, 1 Jan 2017 06:53:29 +0000 Parents: a9aefe5b9bed3cf5236d89140a8d71cceafe683e Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f2eeb47797ff5120413388e7d0f00ea4c8a6b73d Log: Revert "Merge branch 'PHP-7.1'" This reverts commit 7eac2fdf53cda5f3bd34ae64eecbb8b21a6f484b, reversing changes made to 15b80f105cdb9a9210edd9dff7109f0951c843f4. Changed paths: M ext/dom/php_dom.c Diff: diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c index 4924b2e..ef7622c 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->info.internal.module != &dom_module_entry) && base_class->parent != NULL) { + while (base_class->type != ZEND_INTERNAL_CLASS && base_class->parent != NULL) { base_class = base_class->parent; }