From 09cbef9146ba0e904bb589979f1d8fa568792df9 Mon Sep 17 00:00:00 2001
From: Sam Minnee <sam@silverstripe.com>
Date: Tue, 7 Oct 2008 04:03:24 +0000
Subject: [PATCH] BUGFIX: Fixed bug in getCMSFields scaffolding of relations

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@63739 467b73ca-7a2a-4603-9d3b-597d59a354a9
---
 core/model/DataObject.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/model/DataObject.php b/core/model/DataObject.php
index 0e03da2e3..428e4968d 100644
--- a/core/model/DataObject.php
+++ b/core/model/DataObject.php
@@ -1202,7 +1202,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
 	 */
 	protected function addScaffoldRelationFields($fieldSet) {
 		// make sure we have a tabset
-		if($this->has_many() || $this->many_many()) {
+		if(($this->has_many() || $this->many_many()) && !$fieldSet->fieldByName('Root')) {
 			$oldFields = $fieldSet;
 			$fieldSet = new FieldSet(new TabSet("Root", new Tab("Main")));
 			foreach($oldFields as $field) {
@@ -1587,7 +1587,7 @@ class DataObject extends ViewableData implements DataObjectInterface {
 		
 		// If we don't have an ID, then relation fields don't work
 		if($this->ID) {
-			$this->addScaffoldRelationFields($tabbedFields);
+			$tabbedFields = $this->addScaffoldRelationFields($tabbedFields);
 		}
 		
 		$this->extend('updateCMSFields', $tabbedFields);