Skip to content

Commit 19367cd

Browse files
committed
Fix translatable asset controller: make sure the locale is properly passed
1 parent 0fd9d86 commit 19367cd

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/Http/Controllers/AssetController.php

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,14 @@ private function getAssetMedia(HasMedia $asset, ?string $locale = null): ?Media
4040
$assetMedia = null;
4141
if (! $locale && FilamentFlexibleBlocksAssetManagerConfig::hasTranslatableAssets()) {
4242
$locale = app()->getLocale();
43-
$filters = ['locale' => $locale];
44-
$assetMedia = $asset->getFirstMedia($asset->getAssetCollection(), $filters);
4543
}
4644

45+
//first try with locale
46+
$filters = ['locale' => $locale];
47+
$assetMedia = $asset->getFirstMedia($asset->getAssetCollection(), $filters);
48+
4749
if (! $assetMedia) {
50+
//if no media with locale try fallback:
4851
$assetMedia = $asset->getFirstMedia($asset->getAssetCollection());
4952
}
5053

0 commit comments

Comments
 (0)