Merge pull request #100 from webbuilders-group/hasonecomponent_fix

BUGFIX: Fixed crash when the value of the FileAttachmentField is set from a DataObject
unclecheese · Aug 22, 2019 · 5cec6fb · 5cec6fb
2 parents 578ff19 + 41fedb9
commit 5cec6fb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/FileAttachmentField.php b/src/FileAttachmentField.php
@@ -549,12 +549,12 @@ public function setValue($val, $data = array())
             //       an already saved DataObject.
             $fieldName = $this->getName();
             $ids = array();
-            if ($data->hasOneComponent($fieldName)) {
+            if ($data->getSchema()->hasOneComponent(get_class($data), $fieldName)) {
                 $id = $data->{$fieldName.'ID'};
                 if ($id) {
                     $ids[] = $id; 
                 }
-            } else if ($data->hasManyComponent($fieldName) || $data->manyManyComponent($fieldName)) {
+            } else if ($data->getSchema()->hasManyComponent(get_class($data), $fieldName) || $data->getSchema()->manyManyComponent(get_class($data), $fieldName)) {
                 $files = $data->{$fieldName}();
                 if ($files) {
                     foreach ($files as $file) {