diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 09:59:12 +0100 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-02-12 09:59:12 +0100 |
| commit | 8dc7d22747970c813e53b332bad6784a367e3cfc (patch) | |
| tree | 0c42e8ce01aeab7849bd329b947216ce786272cd | |
| parent | e7177ac067be24bf32d6a00ba377acf91df39118 (diff) | |
| parent | e27af3bbea58b7fb9662e70f84a6cd784ee15896 (diff) | |
| download | php-git-8dc7d22747970c813e53b332bad6784a367e3cfc.tar.gz | |
Merge branch 'PHP-7.4'
| -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 0c1ad6da70..011454d163 100644 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@ -5218,7 +5218,6 @@ PHP_METHOD(DatePeriod, __wakeup) /* {{{ date_period_read_property */ static zval *date_period_read_property(zend_object *object, zend_string *name, 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); @@ -5226,13 +5225,7 @@ static zval *date_period_read_property(zend_object *object, zend_string *name, i object->handlers->get_properties(object); /* build properties hash table */ - zv = zend_std_read_property(object, name, 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)(Z_OBJ_P(zv))); - } - - return zv; + return zend_std_read_property(object, name, type, cache_slot, rv); } /* }}} */ |