tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Fixed merge errors

Browse Source
This commit is contained in:
Ingo Schommer 2013-12-06 15:44:24 +01:00
parent 740560c487
commit 323364bc85
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
forms/gridfield/GridFieldSortableHeader.php
View File

@ -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;
}