From a49212262cc23011a309561b2867d3b152e241db Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 21 Apr 2020 12:03:59 +0300
Subject: [PATCH] Fixed custom folder in `mediapicker` field not working with
 streams

---
 CHANGELOG.md                           | 1 +
 classes/plugin/AdminBaseController.php | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d1ab6ec..b405921a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
     * Added badge count for children in the Parents field
 1. [](#bugfix)
     * Prevent loading Pages in Parents field if they don't have children
+    * Fixed custom folder in `mediapicker` field not working with streams
 
 # v1.10.0-rc.8
 ## 03/19/2020
diff --git a/classes/plugin/AdminBaseController.php b/classes/plugin/AdminBaseController.php
index 38fc23ae..b723e3bb 100644
--- a/classes/plugin/AdminBaseController.php
+++ b/classes/plugin/AdminBaseController.php
@@ -22,6 +22,7 @@ use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use RocketTheme\Toolbox\Event\Event;
 use RocketTheme\Toolbox\File\File;
+use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
 
 /**
  * Class AdminController
@@ -817,6 +818,12 @@ class AdminBaseController
 
             $media = $data->getMedia();
         } else {
+            /** @var UniformResourceLocator $locator */
+            $locator = $this->grav['locator'];
+            if ($locator->isStream($folder)) {
+                $folder = $locator->findResource($folder);
+            }
+
             // Set destination
             $folder = Folder::getRelativePath(rtrim($folder, '/'));
             $folder = $this->admin->getPagePathFromToken($folder);