diff options
| author | Nikita Popov <nikic@php.net> | 2016-03-20 17:48:22 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-20 17:48:22 +0100 |
| commit | c4ccb5d5fad1eb4eaefa7f1734269d4ff989136a (patch) | |
| tree | b6f90e12581d9dea7b4cbfb8f52f9b28381fe9b5 /ext/spl/spl_observer.c | |
| parent | 6d98584d0011769fef46db99158160e1dc11831b (diff) | |
| parent | 12f2665df829eac53e2036e335b40cf391ff8652 (diff) | |
| download | php-git-c4ccb5d5fad1eb4eaefa7f1734269d4ff989136a.tar.gz | |
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/spl/spl_observer.c')
| -rw-r--r-- | ext/spl/spl_observer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c index 40de5934d0..223e252e63 100644 --- a/ext/spl/spl_observer.c +++ b/ext/spl/spl_observer.c @@ -243,11 +243,6 @@ static zend_object *spl_object_storage_new_ex(zend_class_entry *class_type, zval intern->std.handlers = &spl_handler_SplObjectStorage; - if (orig) { - spl_SplObjectStorage *other = Z_SPLOBJSTORAGE_P(orig); - spl_object_storage_addall(intern, orig, other); - } - while (parent) { if (parent == spl_ce_SplObjectStorage) { if (class_type != spl_ce_SplObjectStorage) { @@ -262,6 +257,11 @@ static zend_object *spl_object_storage_new_ex(zend_class_entry *class_type, zval parent = parent->parent; } + if (orig) { + spl_SplObjectStorage *other = Z_SPLOBJSTORAGE_P(orig); + spl_object_storage_addall(intern, orig, other); + } + return &intern->std; } /* }}} */ |