Fix translatable asset controller: make sure the locale is properly p…

…assed
statikbe · Nov 18, 2024 · 19367cd · 19367cd
1 parent 0fd9d86
commit 19367cd
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/Http/Controllers/AssetController.php b/src/Http/Controllers/AssetController.php
@@ -40,11 +40,14 @@ private function getAssetMedia(HasMedia $asset, ?string $locale = null): ?Media
         $assetMedia = null;
         if (! $locale && FilamentFlexibleBlocksAssetManagerConfig::hasTranslatableAssets()) {
             $locale = app()->getLocale();
-            $filters = ['locale' => $locale];
-            $assetMedia = $asset->getFirstMedia($asset->getAssetCollection(), $filters);
         }
 
+        //first try with locale
+        $filters = ['locale' => $locale];
+        $assetMedia = $asset->getFirstMedia($asset->getAssetCollection(), $filters);
+
         if (! $assetMedia) {
+            //if no media with locale try fallback:
             $assetMedia = $asset->getFirstMedia($asset->getAssetCollection());
         }