From 0298ee7d7abe7ae33a343d7301f3d43fba0a9028 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 2 Jun 2009 01:37:53 +0000 Subject: [PATCH] MINOR Fixed merge error from r78095 (reverted commit in TableListField made in r77298) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@78207 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- forms/TableListField.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms/TableListField.php b/forms/TableListField.php index a22b51da0..172e33dea 100755 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -1247,7 +1247,7 @@ class TableListField_Item extends ViewableData { // This supports simple FieldName syntax if(strpos($fieldName,'.') === false) { - $value = ($this->item->XML_val($fieldName)) ? $this->item->XML_val($fieldName) : $this->item->$fieldName; + $value = ($this->item->XML_val($fieldName) && $xmlSafe) ? $this->item->XML_val($fieldName) : $this->item->$fieldName; // This support the syntax fieldName = Relation.RelatedField } else { $fieldNameParts = explode('.', $fieldName) ;