From 7ad02787e8cc65d54c8bd117ed099974ae658ca1 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Tue, 17 Jan 2017 10:19:16 +1300
Subject: [PATCH] FIX Regression in CompositeField displaying fields in their
 holders

---
 templates/SilverStripe/Forms/CompositeField.ss | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/SilverStripe/Forms/CompositeField.ss b/templates/SilverStripe/Forms/CompositeField.ss
index 2fb53afa3..41a3ea9b5 100644
--- a/templates/SilverStripe/Forms/CompositeField.ss
+++ b/templates/SilverStripe/Forms/CompositeField.ss
@@ -1,9 +1,9 @@
 <% loop $FieldList %>
 	<% if $ColumnCount %>
 		<div class="column-{$ColumnCount} $FirstLast">
-			$Field
+			$FieldHolder
 		</div>
 	<% else %>
-		$Field
+		$FieldHolder
 	<% end_if %>
 <% end_loop %>