From f15cfaccf447d5a57670fe8722d229f6462dde83 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Thu, 20 Nov 2008 05:12:40 +0000 Subject: [PATCH] BUGFIX: Fixed recursion bug with FieldSet::fieldPosition git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@66305 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/FieldSet.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forms/FieldSet.php b/forms/FieldSet.php index e5e139c63..94ffce40f 100755 --- a/forms/FieldSet.php +++ b/forms/FieldSet.php @@ -515,11 +515,11 @@ class FieldSet extends DataObjectSet { * @return Position in children collection (first position starts with 0). Returns FALSE if the field can't be found. */ function fieldPosition($field) { - if(is_string($field)) $field = $this->fieldByName($field); + if(is_object($field)) $field = $field->Name(); $i = 0; foreach($this->dataFields() as $child) { - if($child == $field) return $i; + if($child->Name() == $field) return $i; $i++; }