Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-09 03:33:47 +02:00
Code Issues Packages Projects Releases Activity

Improve file upload logic on flex objects

Browse Source
This commit is contained in:
Matias Griese
2018-12-12 16:14:55 +02:00
parent 1b21e01938
commit 89a0e960e2
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
system/src/Grav/Framework/Flex/FlexForm.php
View File

@@ -496,12 +496,7 @@ class FlexForm implements FlexFormInterface
{
/** @var FlexObject $object */
$object = clone $this->getObject();
$object->update($data);
if ($files && method_exists($object, 'upload')) {
$object->upload($files);
}
$object->update($data, $files);
$object->save();
$this->setObject($object);

8
system/src/Grav/Framework/Flex/FlexObject.php
View File

@@ -118,10 +118,6 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
// Validate and filter the incoming data.
$blueprint = $this->getFlexDirectory()->getBlueprint();
if ($files && method_exists($this, 'updateMediaFiles')) {
$this->updateMediaFiles($files);
}
if ($data) {
// Filter updated data.
$this->filterElements($data);
@@ -138,6 +134,10 @@ class FlexObject implements FlexObjectInterface, FlexAuthorizeInterface
$this->setElements($data);
}
if ($files && method_exists($this, 'updateMediaFiles')) {
$this->updateMediaFiles($files);
}
return $this;
}