From b3f8bdc8efdd7ebe8ef253d983f9f14ff61bb3db Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 6 Apr 2008 03:36:07 +0000
Subject: [PATCH] Merged revisions 47413 via svnmerge from
 svn://svn.silverstripe.com/silverstripe/modules/sapphire/branches/2.2.0-mesq

........
  r47413 | ischommer | 2007-12-20 18:16:26 +1300 (Thu, 20 Dec 2007) | 1 line

  syntax
........


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

diff --git a/forms/TableField.php b/forms/TableField.php
index 460bbb392..4cb6d37a0 100644
--- a/forms/TableField.php
+++ b/forms/TableField.php
@@ -1,10 +1,4 @@
 <?php
-
-/**
- * @package forms
- * @subpackage fields-relational
- */
-
 /**
  * TableField behaves in the same manner as TableListField, however allows the addition of 
  * fields and editing of attributes specified, and filtering results.
@@ -27,6 +21,7 @@
  * @param $sourceJoin string
  * 
  * @todo We should refactor this to support a single FieldSet instead of evaluated Strings for building FormFields
+ * 
  * @package forms
  * @subpackage fields-relational
  */
@@ -668,7 +663,7 @@ class TableField_Item extends TableListField_Item {
 					$field->Name = $combinedFieldName;
 					$field->setValue($field->dataValue());
 					$field->addExtraClass('col'.$i);
-					$field->setForm($this->data);
+					$field->setForm($this->Parent()->getForm());
 
 					// transformation
 					if(isset($this->parent->transformationConditions[$origFieldName])) {