From f22a4b980bff59a425c3bd30d0af4bed2b77ff2f Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 26 Nov 2018 16:01:46 +0100 Subject: [PATCH] FIX getComponentByType can return null - prevent null pointer errors --- src/Forms/GridField/GridFieldDetailForm_ItemRequest.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php index f83442288..a5724dcf6 100644 --- a/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php +++ b/src/Forms/GridField/GridFieldDetailForm_ItemRequest.php @@ -284,9 +284,10 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $previousAndNextGroup->addExtraClass('circular-group mr-2'); $previousAndNextGroup->setFieldHolderTemplate(get_class($previousAndNextGroup) . '_holder_buttongroup'); + /** @var GridFieldDetailForm $component */ $component = $this->gridField->getConfig()->getComponentByType(GridFieldDetailForm::class); $gridState = $this->getRequest()->requestVar('gridState'); - if ($component->getShowPagination()) { + if ($component && $component->getShowPagination()) { $previousAndNextGroup->push(FormAction::create('doPrevious') ->setUseButtonTag(true) ->setAttribute('data-grid-state', $gridState) @@ -302,7 +303,7 @@ class GridFieldDetailForm_ItemRequest extends RequestHandler $rightGroup->push($previousAndNextGroup); - if ($component->getShowAdd()) { + if ($component && $component->getShowAdd()) { $rightGroup->push(FormAction::create('doNew') ->setUseButtonTag(true) ->setAttribute('data-grid-state', $this->getRequest()->getVar('gridState'))