diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-01 06:48:24 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-01 06:48:24 +0000 |
| commit | 7eac2fdf53cda5f3bd34ae64eecbb8b21a6f484b (patch) | |
| tree | 617b25c533cd03fd9251c4848956c871ac792514 /ext | |
| parent | 15b80f105cdb9a9210edd9dff7109f0951c843f4 (diff) | |
| parent | 705f60e481b891d009ec9bb4c88390545ff95880 (diff) | |
| download | php-git-7eac2fdf53cda5f3bd34ae64eecbb8b21a6f484b.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix dom class can't be inherited by the internal class
Diffstat (limited to 'ext')
| -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..4924b2ef67 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 != &dom_module_entry) && base_class->parent != NULL) { base_class = base_class->parent; } |