]> granicus.if.org Git - php/commitdiff
Revert "Merge branch 'PHP-7.1'"
authorJoe Watkins <krakjoe@php.net>
Sun, 1 Jan 2017 06:53:29 +0000 (06:53 +0000)
committerJoe Watkins <krakjoe@php.net>
Sun, 1 Jan 2017 06:53:29 +0000 (06:53 +0000)
This reverts commit 7eac2fdf53cda5f3bd34ae64eecbb8b21a6f484b, reversing
changes made to 15b80f105cdb9a9210edd9dff7109f0951c843f4.

ext/dom/php_dom.c

index 4924b2ef67efac6afc50ef0b51ce38107bbb84b2..ef7622c893d4db2308e504b9316f7de2bf2968b8 100644 (file)
@@ -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;
        }