From d5eca59dc615686f6d5e10efd325a4972fd24f7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20Sandstr=C3=B6m?= Date: Wed, 23 Jan 2019 08:25:16 +0100 Subject: [PATCH] Remove application root relative to domain root from $mediaFinder->storagePath (#4055) This gets added later through the use of Url::to(). Credit to @adsa95. Fixes #4065, fixes #4039 --- modules/system/classes/MediaLibrary.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/modules/system/classes/MediaLibrary.php b/modules/system/classes/MediaLibrary.php index b49a17d0b..859fa056d 100644 --- a/modules/system/classes/MediaLibrary.php +++ b/modules/system/classes/MediaLibrary.php @@ -73,10 +73,6 @@ class MediaLibrary $this->storageFolder = self::validatePath(Config::get('cms.storage.media.folder', 'media'), true); $this->storagePath = rtrim(Config::get('cms.storage.media.path', '/storage/app/media'), '/'); - if (!starts_with($this->storagePath, ['//', 'http://', 'https://'])) { - $this->storagePath = Request::getBasePath() . $this->storagePath; - } - $this->ignoreNames = Config::get('cms.storage.media.ignore', FileDefinitions::get('ignoreFiles')); $this->ignorePatterns = Config::get('cms.storage.media.ignorePatterns', ['^\..*']);