Merge branch '5.x' into 6.x

jasonvarga · jasonvarga · commit 715abc551835 · 2026-01-30T12:04:11.000-05:00
# Conflicts:
#	CHANGELOG.md
#	resources/js/components/fieldtypes/assets/AssetsIndexFieldtype.vue
diff --git a/src/Http/Controllers/CP/Assets/AssetsController.php b/src/Http/Controllers/CP/Assets/AssetsController.php
@@ -42,6 +42,8 @@ public function show($asset)
     {
         $asset = Asset::find(base64_decode($asset));
 
+        abort_if(! $asset, 404);
+
         // TODO: Auth
 
         return new AssetResource($asset);
@@ -132,6 +134,8 @@ public function download($asset)
     {
         $asset = Asset::find(base64_decode($asset));
 
+        abort_if(! $asset, 404);
+
         // TODO: Auth
 
         return $asset->download();

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,8 @@ public function show($asset)`
`42`	`42`	`{`
`43`	`43`	`$asset = Asset::find(base64_decode($asset));`
`44`	`44`
	`45`	`+ abort_if(! $asset, 404);`
	`46`	`+`
`45`	`47`	`// TODO: Auth`
`46`	`48`
`47`	`49`	`return new AssetResource($asset);`
`@@ -132,6 +134,8 @@ public function download($asset)`
`132`	`134`	`{`
`133`	`135`	`$asset = Asset::find(base64_decode($asset));`
`134`	`136`
	`137`	`+ abort_if(! $asset, 404);`
	`138`	`+`
`135`	`139`	`// TODO: Auth`
`136`	`140`
`137`	`141`	`return $asset->download();`