diff options
| author | Anatol Belski <ab@php.net> | 2016-10-12 18:31:46 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2016-10-14 01:44:31 +0200 |
| commit | a6715786a7e19b4c3deb0b366e21bbf49e40bf4f (patch) | |
| tree | abec48d73048e90b379a956af90c78cc612139b2 /Zend/zend_API.c | |
| parent | 54003ab6631b489af54631a548597e8bd599b266 (diff) | |
| download | php-git-a6715786a7e19b4c3deb0b366e21bbf49e40bf4f.tar.gz | |
finish 7.1 port
(cherry picked from commit f1fff032fcdb09a56c2fd763d1ee160106381586)
Diffstat (limited to 'Zend/zend_API.c')
| -rw-r--r-- | Zend/zend_API.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_API.c b/Zend/zend_API.c index a71aca8106..2479cf0d32 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -3889,9 +3889,9 @@ ZEND_API void zend_update_property_null(zend_class_entry *scope, zval *object, c ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const char *name, size_t name_length) /* {{{ */ { zval property; - zend_class_entry *old_scope = EG(scope); + zend_class_entry *old_scope = EG(fake_scope); - EG(scope) = scope; + EG(fake_scope) = scope; if (!Z_OBJ_HT_P(object)->unset_property) { zend_error_noreturn(E_CORE_ERROR, "Property %s of class %s cannot be unset", name, ZSTR_VAL(Z_OBJCE_P(object)->name)); @@ -3900,7 +3900,7 @@ ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const c Z_OBJ_HT_P(object)->unset_property(object, &property, 0); zval_ptr_dtor(&property); - EG(scope) = old_scope; + EG(fake_scope) = old_scope; } /* }}} */ |