diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 09:57:18 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 09:57:18 +0100 |
| commit | 8ed775f548d2535b87ff439f0b0a04b7770ed914 (patch) | |
| tree | 62ff3eeb4eb78e63f479d467b25202b028707090 | |
| parent | c553d17f11bab2ef347bc7e72a4e9c55217524f1 (diff) | |
| parent | a109fddba4e3fbb6e3a2e008c0fa20a57f26103d (diff) | |
| download | php-git-8ed775f548d2535b87ff439f0b0a04b7770ed914.tar.gz | |
Merge branch 'PHP-7.2' into PHP-7.3
| -rw-r--r-- | ext/date/php_date.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/date/php_date.c b/ext/date/php_date.c index 7b1836e938..32530ef734 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -5275,7 +5275,6 @@ PHP_METHOD(DatePeriod, __wakeup) /* {{{ date_period_read_property */ static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) { - zval *zv; if (type != BP_VAR_IS && type != BP_VAR_R) { zend_throw_error(NULL, "Retrieval of DatePeriod properties for modification is unsupported"); return &EG(uninitialized_zval); @@ -5283,13 +5282,7 @@ static zval *date_period_read_property(zval *object, zval *member, int type, voi Z_OBJPROP_P(object); /* build properties hash table */ - zv = zend_std_read_property(object, member, type, cache_slot, rv); - if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) { - /* defensive copy */ - ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(zv)); - } - - return zv; + return zend_std_read_property(object, member, type, cache_slot, rv); } /* }}} */ |