diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-01 06:53:29 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-01 06:53:29 +0000 |
| commit | f2eeb47797ff5120413388e7d0f00ea4c8a6b73d (patch) | |
| tree | 9d88f1a14746005e39cb617969a5331ea420a7c9 /ext/dom | |
| parent | a9aefe5b9bed3cf5236d89140a8d71cceafe683e (diff) | |
| download | php-git-f2eeb47797ff5120413388e7d0f00ea4c8a6b73d.tar.gz | |
Revert "Merge branch 'PHP-7.1'"
This reverts commit 7eac2fdf53cda5f3bd34ae64eecbb8b21a6f484b, reversing
changes made to 15b80f105cdb9a9210edd9dff7109f0951c843f4.
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 4924b2ef67..ef7622c893 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; } |