FIX FlysystemAssetStore::getAsURL() only grant for protected filesystems

silverstripe · Sep 20, 2018 · 16b3d18 · 16b3d18
1 parent f580719
commit 16b3d18
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/Flysystem/FlysystemAssetStore.php b/src/Flysystem/FlysystemAssetStore.php
@@ -217,9 +217,6 @@ public function getAsString($filename, $hash, $variant = null)
 
     public function getAsURL($filename, $hash, $variant = null, $grant = true)
     {
-        if ($grant) {
-            $this->grant($filename, $hash);
-        }
         $fileID = $this->getFileID($filename, $hash, $variant);
 
         // Check with filesystem this asset exists in
@@ -230,6 +227,10 @@ public function getAsURL($filename, $hash, $variant = null, $grant = true)
             $publicAdapter = $public->getAdapter();
             return $publicAdapter->getPublicUrl($fileID);
         } else {
+            if ($grant) {
+                $this->grant($filename, $hash);
+            }
+
             /** @var ProtectedAdapter $protectedAdapter */
             $protectedAdapter = $protected->getAdapter();
             return $protectedAdapter->getProtectedUrl($fileID);