From 46b792b27f9c727dea6b2c80a5bb0b6786cd53ef Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Thu, 24 Aug 2017 12:43:33 +1200
Subject: [PATCH] FIX Import Closure class for type checking, and only set sort
 if the sort field exists

---
 src/GridFieldEditableColumns.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/GridFieldEditableColumns.php b/src/GridFieldEditableColumns.php
index 0e7128a..7af0240 100644
--- a/src/GridFieldEditableColumns.php
+++ b/src/GridFieldEditableColumns.php
@@ -3,6 +3,7 @@
 namespace Symbiote\GridFieldExtensions;
 
 use Closure;
+use Exception;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\HTTPRequest;
 use SilverStripe\Control\HTTPResponse_Exception;
@@ -22,7 +23,6 @@ use SilverStripe\ORM\DataList;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DataObjectInterface;
 use SilverStripe\ORM\ManyManyList;
-use Exception;
 
 /**
  * Allows inline editing of grid field records without having to load a separate
@@ -145,7 +145,9 @@ class GridFieldEditableColumns extends GridFieldDataColumns implements
             // Check if we are also sorting these records
             if ($sortable) {
                 $sortField = $sortable->getSortField();
-                $item->setField($sortField, $fields[$sortField]);
+                if (isset($fields[$sortField])) {
+                    $item->setField($sortField, $fields[$sortField]);
+                }
             }
 
             if ($list instanceof ManyManyList) {