Skip to content

Commit 8ed775f

Browse files
committed
Merge branch 'PHP-7.2' into PHP-7.3
2 parents c553d17 + a109fdd commit 8ed775f

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

ext/date/php_date.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5275,21 +5275,14 @@ PHP_METHOD(DatePeriod, __wakeup)
52755275
/* {{{ date_period_read_property */
52765276
static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv)
52775277
{
5278-
zval *zv;
52795278
if (type != BP_VAR_IS && type != BP_VAR_R) {
52805279
zend_throw_error(NULL, "Retrieval of DatePeriod properties for modification is unsupported");
52815280
return &EG(uninitialized_zval);
52825281
}
52835282

52845283
Z_OBJPROP_P(object); /* build properties hash table */
52855284

5286-
zv = zend_std_read_property(object, member, type, cache_slot, rv);
5287-
if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) {
5288-
/* defensive copy */
5289-
ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(zv));
5290-
}
5291-
5292-
return zv;
5285+
return zend_std_read_property(object, member, type, cache_slot, rv);
52935286
}
52945287
/* }}} */
52955288

0 commit comments

Comments
 (0)