From 3f2579a4f1277ddcac9b1330148a6c0b96adf5a1 Mon Sep 17 00:00:00 2001
From: Marcus Nyeholt <marcus@silverstripe.com.au>
Date: Mon, 11 Apr 2016 14:15:15 +1000
Subject: [PATCH] FIX HtmlEditorField in editable column

Rather than disable the field as per #128, use the full
FieldHolder method to bring the wrapping divs that appear to be necessary
in 3.2 and up. Still a couple of occassional issues, but much less flakey
---
 code/GridFieldEditableColumns.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/code/GridFieldEditableColumns.php b/code/GridFieldEditableColumns.php
index 3abeac7..2e2b12c 100644
--- a/code/GridFieldEditableColumns.php
+++ b/code/GridFieldEditableColumns.php
@@ -70,6 +70,10 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
 
 		$field->setName($this->getFieldName($field->getName(), $grid, $record));
 		$field->setValue($value);
+        
+        if ($field instanceof HtmlEditorField) {
+            return $field->FieldHolder(); 
+        }
 
 		return $field->forTemplate();
 	}