Fixed custom folder in mediapicker field not working with streams

This commit is contained in:
Matias Griese
2020-04-21 12:03:59 +03:00
parent 8175352024
commit a49212262c
2 changed files with 8 additions and 0 deletions

View File

@@ -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);