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

Merge pull request #10159 from creative-commoners/pulls/4/tmpitem

Browse Source 
FIX Ensure tmpItem has a value before calling method_exists on it
This commit is contained in:
Michal Kleiner 2021-11-25 16:19:44 +13:00 committed by GitHub
commit 1425146dad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Forms/GridField/GridFieldSortableHeader.php
View File

@ -146,7 +146,7 @@ class GridFieldSortableHeader implements GridField_HTMLProvider, GridField_DataM
if ($tmpItem instanceof SS_List) { if ($tmpItem instanceof SS_List) {
// It's impossible to sort on a HasManyList/ManyManyList // It's impossible to sort on a HasManyList/ManyManyList
break; break;
} elseif (method_exists($tmpItem, 'hasMethod') && $tmpItem->hasMethod($methodName)) { } elseif ($tmpItem && method_exists($tmpItem, 'hasMethod') && $tmpItem->hasMethod($methodName)) {
// The part is a relation name, so get the object/list from it // The part is a relation name, so get the object/list from it
$tmpItem = $tmpItem->$methodName(); $tmpItem = $tmpItem->$methodName();
} elseif ($tmpItem instanceof DataObject } elseif ($tmpItem instanceof DataObject