From 5d2aa717f375c4abbf148ce639ae2af2aeea9ef3 Mon Sep 17 00:00:00 2001 From: UndefinedOffset Date: Tue, 22 Nov 2016 09:34:35 -0400 Subject: [PATCH] Fix crash when the sort state is empty or not set --- code/forms/GridFieldSortableRows.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/forms/GridFieldSortableRows.php b/code/forms/GridFieldSortableRows.php index 0ff55d9..5953ff4 100644 --- a/code/forms/GridFieldSortableRows.php +++ b/code/forms/GridFieldSortableRows.php @@ -118,7 +118,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP $headerState = $gridField->State->GridFieldSortableHeader; $state = $gridField->State->GridFieldSortableRows; - if ((!is_bool($state->sortableToggle) || $state->sortableToggle==false) && $headerState && !empty($headerState->SortColumn)) { + if ((!is_bool($state->sortableToggle) || $state->sortableToggle==false) && $headerState && !empty($headerState->SortColumn) && (is_string($headerState->SortColumn) || is_array($headerState->SortColumn))) { return $dataList->sort($headerState->SortColumn); }