finish 7.1 port

(cherry picked from commit f1fff032fcdb09a56c2fd763d1ee160106381586)

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index a71aca810654dd869eb6bc0d15bbb5bb4c3bc0ce..2479cf0d32a0ff9160144db47ea6c7781ddafd40 100644 (file)
--- 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;
 }
 /* }}} */