Merge branch 'spekulatius-fixing-must-be-an-Int-column-is-of-type-int'

This commit is contained in:
Ed Chipman 2015-12-10 19:33:08 -04:00
commit e1b94a3bf3

View File

@ -163,7 +163,7 @@ class GridFieldSortableRows implements GridField_HTMLProvider, GridField_ActionP
if (!$many_many) { if (!$many_many) {
$sng=singleton($gridField->getModelClass()); $sng=singleton($gridField->getModelClass());
$fieldType=$sng->db($this->sortColumn); $fieldType=$sng->db($this->sortColumn);
if(!$fieldType || !($fieldType=='Int' || is_subclass_of('Int', $fieldType))) { if(!$fieldType || !(strtolower($fieldType) == 'int' || is_subclass_of('Int', $fieldType))) {
if(is_array($fieldType)) { if(is_array($fieldType)) {
user_error('Sort column '.$this->sortColumn.' could not be found in '.$gridField->getModelClass().'\'s ancestry', E_USER_ERROR); user_error('Sort column '.$this->sortColumn.' could not be found in '.$gridField->getModelClass().'\'s ancestry', E_USER_ERROR);
}else { }else {