From 323364bc8599c30c2bd3b16e3932b196aefc1e3e Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Fri, 6 Dec 2013 15:44:24 +0100
Subject: [PATCH] Fixed merge errors

---
 forms/gridfield/GridFieldSortableHeader.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/forms/gridfield/GridFieldSortableHeader.php b/forms/gridfield/GridFieldSortableHeader.php
index 0a9368460..c0b9a5735 100644
--- a/forms/gridfield/GridFieldSortableHeader.php
+++ b/forms/gridfield/GridFieldSortableHeader.php
@@ -202,8 +202,7 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
 		if(!$this->checkDataType($dataList)) return $dataList;
 
 		$state = $gridField->State->GridFieldSortableHeader;
-		$sortColumn = $state->SortColumn();
-		if (empty($sortColumn)) {
+		if ($state->SortColumn == "") {
 			return $dataList;
 		}