]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 12 Feb 2019 08:57:18 +0000 (09:57 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 12 Feb 2019 08:57:18 +0000 (09:57 +0100)
1  2 
ext/date/php_date.c

index 7b1836e9380d41bb168d203dc66fc0bcef560ad2,c8479b5164e99b08639de8d5d2e940269a8df642..32530ef7349bd6ebba5118b008e0daa8492e2c82
@@@ -5283,13 -5285,7 +5282,7 @@@ static zval *date_period_read_property(
  
        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 std_object_handlers.read_property(object, member, type, cache_slot, rv);
++      return zend_std_read_property(object, member, type, cache_slot, rv);
  }
  /* }}} */