com php-src: finish 7.1 port: Zend/zend_API.c

Commit: f1fff032fcdb09a56c2fd763d1ee160106381586 Author: Anatol Belski <ab@php.net> Wed, 12 Oct 2016 18:31:46 +0200 Parents: b1ef60f90e1adb3d21871322ad39fec324d60ef6 Branches: PHP-7.1 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f1fff032fcdb09a56c2fd763d1ee160106381586 Log: finish 7.1 port Changed paths: M Zend/zend_API.c Diff: diff --git a/Zend/zend_API.c b/Zend/zend_API.c index a71aca8..2479cf0 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; } /* }}} */