From f5e53a9a4ccec9cd4e2aca9a0dcdbec0c4b50047 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 23 Sep 2020 16:17:25 +0300
Subject: [PATCH] Fixed `FlexObject::freeMedia()` method causing media to
 become null

---
 CHANGELOG.md                                             | 1 +
 system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 545eef34c..a88eb7a17 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@
     * Fixed `onBlueprintCreated` firing multiple times recursively
     * Fixed media upload failing with custom folders
     * Fixed `unset()` in `ObjectProperty` class
+    * Fixed `FlexObject::freeMedia()` method causing media to become null
 
 # v1.7.0-rc.16
 ## 09/01/2020
diff --git a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
index 8136f1776..551f45434 100644
--- a/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
+++ b/system/src/Grav/Framework/Flex/Traits/FlexMediaTrait.php
@@ -274,6 +274,14 @@ trait FlexMediaTrait
         $this->clearMediaCache();
     }
 
+    /**
+     * @return void
+     */
+    protected function freeMedia(): void
+    {
+        $this->unsetObjectProperty('media');
+    }
+
     /**
      * @param string $uri
      * @return Medium|null