From 03436a670fb55d40592355fc23781ea0f7428059 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Thu, 4 Jun 2020 16:26:40 +0300
Subject: [PATCH] Add media support for Flex GenericObject

---
 system/src/Grav/Common/Flex/Types/Generic/GenericObject.php | 2 ++
 system/src/Grav/Common/Flex/Types/Users/UserObject.php      | 2 +-
 system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php    | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php b/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
index 9986d583f..e7dccf2ea 100644
--- a/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
+++ b/system/src/Grav/Common/Flex/Types/Generic/GenericObject.php
@@ -14,6 +14,7 @@ namespace Grav\Common\Flex\Types\Generic;
 use Grav\Common\Flex\Traits\FlexGravTrait;
 use Grav\Common\Flex\Traits\FlexObjectTrait;
 use Grav\Framework\Flex\FlexObject;
+use Grav\Framework\Flex\Traits\FlexMediaTrait;
 
 /**
  * Class GenericObject
@@ -23,4 +24,5 @@ class GenericObject extends FlexObject
 {
     use FlexGravTrait;
     use FlexObjectTrait;
+    use FlexMediaTrait;
 }
diff --git a/system/src/Grav/Common/Flex/Types/Users/UserObject.php b/system/src/Grav/Common/Flex/Types/Users/UserObject.php
index c794aa809..d1f0f1361 100644
--- a/system/src/Grav/Common/Flex/Types/Users/UserObject.php
+++ b/system/src/Grav/Common/Flex/Types/Users/UserObject.php
@@ -734,7 +734,7 @@ class UserObject extends FlexObject implements UserInterface, MediaManipulationI
 
     protected function saveUpdatedMedia(): void
     {
-        $media = $this->getFlexMedia();
+        $media = $this->getMedia();
         if (!$media instanceof MediaUploadInterface) {
             throw new \RuntimeException('Internal error UO101');
         }
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
index 1481ff261..43e80ad54 100644
--- a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
+++ b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
@@ -192,7 +192,7 @@ trait FlexMediaTrait
      */
     protected function saveUpdatedMedia(): void
     {
-        $media = $this->getExistingMedia();
+        $media = $this->getMedia();
 
         // Upload/delete altered files.
         /**