From b0a1effaf97c9f7d0b8756c8db4bfb8c2d576ba7 Mon Sep 17 00:00:00 2001 From: Matias Griese Date: Thu, 25 Jun 2020 15:58:18 +0300 Subject: [PATCH] Fixed uploading media in non-existing object --- system/src/Grav/Common/Media/Traits/MediaUploadTrait.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php b/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php index 931962b63..9a7d54e8f 100644 --- a/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php +++ b/system/src/Grav/Common/Media/Traits/MediaUploadTrait.php @@ -64,7 +64,8 @@ trait MediaUploadTrait } // Destination is always needed (but it can be set in defaults). - if (!isset($settings['destination'])) { + $self = $settings['self'] ?? false; + if (!isset($settings['destination']) && $self === false) { throw new RuntimeException($this->translate('PLUGIN_ADMIN.DESTINATION_NOT_SPECIFIED'), 400); } @@ -102,7 +103,7 @@ trait MediaUploadTrait // Handle conflicting filename if needed. if ($settings['avoid_overwriting']) { $destination = $settings['destination']; - if (file_exists("{$destination}/{$filename}")) { + if ($destination && file_exists("{$destination}/{$filename}")) { $filename = date('YmdHis') . '-' . $filename; } }