diff options
| author | Johannes Schlüter <johannes@php.net> | 2019-02-12 14:59:27 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2019-02-12 14:59:27 +0100 |
| commit | 56dba3f3d05bbe7eedb31f9c85e1a5b55c99ceec (patch) | |
| tree | 12e8fe28f51ea34790116d7decac44b62049c7b7 /ext/date/php_date.c | |
| parent | 83d2bc9b6df2f827217f1bc3298fb83cfe2ac210 (diff) | |
| parent | 07877c46e3057bc679766898d50529be812243f3 (diff) | |
| download | php-git-56dba3f3d05bbe7eedb31f9c85e1a5b55c99ceec.tar.gz | |
Merge remote-tracking branch 'origin/PHP-7.2' into PHP-7.2
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 1e136e00b6..c8479b5164 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 = std_object_handlers.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 std_object_handlers.read_property(object, member, type, cache_slot, rv); } /* }}} */ |