X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/d5b7fff102b31fa464ba368560ae8910152ab3e6..refs/pull/3918/head:/app/Uploads/AttachmentService.php diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php index 9d1f96ae4..88bb41efb 100644 --- a/app/Uploads/AttachmentService.php +++ b/app/Uploads/AttachmentService.php @@ -41,7 +41,7 @@ class AttachmentService // Change to our secure-attachment disk if any of the local options // are used to prevent escaping that location. - if ($storageType === 'local' || $storageType === 'local_secure') { + if ($storageType === 'local' || $storageType === 'local_secure' || $storageType === 'local_secure_restricted') { $storageType = 'local_secure_attachments'; } @@ -63,16 +63,6 @@ class AttachmentService return 'uploads/files/' . $path; } - /** - * Get an attachment from storage. - * - * @throws FileNotFoundException - */ - public function getAttachmentFromStorage(Attachment $attachment): string - { - return $this->getStorageDisk()->get($this->adjustPathForStorageDisk($attachment->path)); - } - /** * Stream an attachment from storage. *