From: Nikita Popov Date: Thu, 29 May 2014 19:49:54 +0000 (+0200) Subject: Revert "Fix ArrayObject with immutable array" X-Git-Tag: POST_PHPNG_MERGE~236^2~1 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=92c9f826c988287165e2439026e9a21d299dbe81;p=php Revert "Fix ArrayObject with immutable array" This reverts commit 9c85aa0489671e6cec43406161c558567e5b7336. --- diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c index 9420990d6c..2fa7a53dd3 100644 --- a/ext/spl/spl_array.c +++ b/ext/spl/spl_array.c @@ -1146,9 +1146,6 @@ static void spl_array_set_array(zval *object, spl_array_object *intern, zval *ar if (Z_TYPE_P(array) == IS_ARRAY) { SEPARATE_ZVAL_IF_NOT_REF(array); } - if (Z_IMMUTABLE_P(array)) { - zval_copy_ctor(array); - } if (Z_TYPE_P(array) == IS_OBJECT && (Z_OBJ_HT_P(array) == &spl_handler_ArrayObject || Z_OBJ_HT_P(array) == &spl_handler_ArrayIterator)) { zval_ptr_dtor(&intern->array);