Guest create page: name field autofocus

[bookstack] / app / Uploads / AttachmentService.php

diff --git a/app/Uploads/AttachmentService.php b/app/Uploads/AttachmentService.php
index 9d1f96ae42f99178f6b3fd10406a4572805b5943..88bb41efb0bcc614eaafa22ac421733446484383 100644 (file)
--- 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.
 
         // 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';
         }
 
             $storageType = 'local_secure_attachments';
         }
 


@@ -63,16 +63,6 @@ class AttachmentService
         return 'uploads/files/' . $path;
     }
 
         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.
      *
     /**
      * Stream an attachment from storage.
      *