From 8e5bb6fbdce0b2ca2d08a45534df2264db5e6b12 Mon Sep 17 00:00:00 2001 From: Jason Date: Fri, 21 Oct 2016 11:36:16 +1100 Subject: [PATCH] BUG Fix : relObject() should return null if one of the node is null --- model/DataObject.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/model/DataObject.php b/model/DataObject.php index 1ac147fcd..97ead6b6e 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -3069,8 +3069,11 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity $relations = explode('.', $fieldName); $fieldName = array_pop($relations); foreach($relations as $relation) { + // Bail if the component is null + if(!$component) { + return null; // Inspect $component for element $relation - if($component->hasMethod($relation)) { + } elseif($component->hasMethod($relation)) { // Check nested method $component = $component->$relation(); } elseif($component instanceof SS_List) {