archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 17:04:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'PHP-7.1'

Browse source 
* PHP-7.1:
  finish 7.1 port
This commit is contained in:
Anatol Belski 2016-10-12 18:33:28 +02:00
commit 10fe10ee1f
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Zend/zend_API.c
View file

@ -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) /* {{{ */ ZEND_API void zend_unset_property(zend_class_entry *scope, zval *object, const char *name, size_t name_length) /* {{{ */
{ {
zval property; 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) { 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)); 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); Z_OBJ_HT_P(object)->unset_property(object, &property, 0);
zval_ptr_dtor(&property); zval_ptr_dtor(&property);
EG(scope) = old_scope; EG(fake_scope) = old_scope;
} }
/* }}} */ /* }}} */