From 126fd9add6978e3bbba51f0ad098ebc821640f7f Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 20 May 2010 09:31:17 +0000 Subject: [PATCH] MINOR Reverted r105264, breaks CompositeFieldTest, FieldSetTest, TranslatableTest git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@105274 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/FieldSet.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forms/FieldSet.php b/forms/FieldSet.php index 632a61aee..f37d91e58 100755 --- a/forms/FieldSet.php +++ b/forms/FieldSet.php @@ -335,8 +335,7 @@ class FieldSet extends DataObjectSet { $i = 0; foreach($this->items as $child) { if($name == $child->Name() || $name == $child->id) { - // On PHP 5.2.6, using $this->items directly in array_splice can segfault - $itms = $this->items; array_splice($itms, $i, 0, array($item)); + array_splice($this->items, $i, 0, array($item)); return $item; } elseif($child->isComposite()) { $ret = $child->insertBefore($item, $name);