From db4aec777100e06d1fa06b50f7e67d06fc691835 Mon Sep 17 00:00:00 2001 From: Suraj Dadral Date: Tue, 30 May 2023 12:06:23 +0530 Subject: [PATCH] fix: fixes custom disk file url for non-root_override disks Before: Storage::disk('branding')->url('logo.png') returns 'storage/logo.png' After: Storage::disk('branding')->url('logo.png') returns 'storage/tenant1/logo.png' --- src/Bootstrappers/FilesystemTenancyBootstrapper.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/Bootstrappers/FilesystemTenancyBootstrapper.php b/src/Bootstrappers/FilesystemTenancyBootstrapper.php index 346892b3..378c683d 100644 --- a/src/Bootstrappers/FilesystemTenancyBootstrapper.php +++ b/src/Bootstrappers/FilesystemTenancyBootstrapper.php @@ -72,6 +72,11 @@ class FilesystemTenancyBootstrapper implements TenancyBootstrapper } $this->app['config']["filesystems.disks.{$disk}.root"] = $finalPrefix; + + if (!isset($this->app['config']["tenancy.filesystem.root_override.{$disk}"])) { + $originalUrl = $this->app['config']["filesystems.disks.{$disk}.url"]; + $this->app['config']["filesystems.disks.{$disk}.url"] = $originalUrl ? rtrim($originalUrl, '/') . '/'. $suffix : $suffix; + } } }