From 7666651324a80139fb2a9317979e59b3d19c0b37 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Fri, 28 Jan 2022 05:10:18 +0200
Subject: [PATCH] Fixed error on thumbnail image creation

---
 CHANGELOG.md                                             | 2 ++
 system/src/Grav/Common/Media/Traits/MediaObjectTrait.php | 9 +++++----
 system/src/Grav/Common/Page/Medium/Medium.php            | 1 +
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f3684109..4858eccf1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 2. [](#improved)
     * Improved `Filesystem::basename()` and `Filesystem::pathinfo()` to be unicode-safe
     * Made path handling unicode-safe, use new `Utils::basename()` and `Utils::pathinfo()` everywhere
+3. [](#bugfix)
+    * Fixed error on thumbnail image creation
     * Fixed MimeType for `gzip` (`application/x-gzip`)
 
 # v1.7.28
diff --git a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
index edabbdeb6..85ed6d224 100644
--- a/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
+++ b/system/src/Grav/Common/Media/Traits/MediaObjectTrait.php
@@ -574,11 +574,12 @@ trait MediaObjectTrait
 
             foreach ($types as $type) {
                 $thumb = $this->get("thumbnails.{$type}", false);
-
                 if ($thumb) {
-                    $thumb = $thumb instanceof ThumbnailImageMedium ? $thumb : $this->createThumbnail($thumb);
-                    $thumb->parent = $this;
-                    $this->_thumbnail = $thumb;
+                    $image = $thumb instanceof ThumbnailImageMedium ? $thumb : $this->createThumbnail($thumb);
+                    if($image) {
+                        $image->parent = $this;
+                        $this->_thumbnail = $image;
+                    }
                     break;
                 }
             }
diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php
index b65f7d0fa..0891c0c46 100644
--- a/system/src/Grav/Common/Page/Medium/Medium.php
+++ b/system/src/Grav/Common/Page/Medium/Medium.php
@@ -106,6 +106,7 @@ class Medium extends Data implements RenderableInterface, MediaFileInterface
 
     /**
      * @param string $thumb
+     * @return Medium|null
      */
     protected function createThumbnail($thumb)
     {