Merge pull request #3612 from bruenner-elements/localizedfields_fix

Pimcore 5.5.3 - Pimcore\Model\DataObject\ClassDefinition\Data\Localizedfields#doGetDataForEditMode missing if-Statements
pimcore · Nov 16, 2018 · d57128d · d57128d
2 parents 3a26f93 + 8d816ec
commit d57128d
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/models/DataObject/ClassDefinition/Data/Localizedfields.php b/models/DataObject/ClassDefinition/Data/Localizedfields.php
@@ -199,26 +199,31 @@ private function doGetDataForEditMode($data, $object, &$fieldData, &$metaData, $
                 }
 
                 if ($foundEmptyValue) {
+                    $parentData = null;
                     // still some values are passing, ask the parent
                     if ($params['context'] && $params['context']['containerType'] == 'objectbrick') {
                         $brickContainerGetter = 'get' . ucfirst($params['fieldname']);
                         $brickContainer = $parent->$brickContainerGetter();
                         $brickGetter = 'get' . ucfirst($params['context']['containerKey']);
                         $brickData = $brickContainer->$brickGetter();
-                        $parentData = $brickData->getLocalizedFields();
+                        if($brickData) {
+                            $parentData = $brickData->getLocalizedFields();
+                        }
                     } else {
                         if (method_exists($parent, 'getLocalizedFields')) {
                             $parentData = $parent->getLocalizedFields();
                         }
                     }
-                    $parentResult = $this->doGetDataForEditMode(
-                        $parentData,
-                        $parent,
-                        $fieldData,
-                        $metaData,
-                        $level + 1,
-                        $params
-                    );
+                    if($parentData) {
+                        $parentResult = $this->doGetDataForEditMode(
+                            $parentData,
+                            $parent,
+                            $fieldData,
+                            $metaData,
+                            $level + 1,
+                            $params
+                        );
+                    }
                 }
             }
         }