diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 09:57:38 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 09:57:38 +0100 |
| commit | e27af3bbea58b7fb9662e70f84a6cd784ee15896 (patch) | |
| tree | 54cdd59fd59eb3414422825ea5f3c075a02ca387 /ext/date/php_date.c | |
| parent | d8b2705d6262f208b593b7c43cd66670dffc5a12 (diff) | |
| parent | 8ed775f548d2535b87ff439f0b0a04b7770ed914 (diff) | |
| download | php-git-e27af3bbea58b7fb9662e70f84a6cd784ee15896.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
Diffstat (limited to 'ext/date/php_date.c')
| -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 94db24ce3b..8bb310f2a7 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -5278,7 +5278,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); @@ -5286,13 +5285,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); } /* }}} */ |