Merge pull request #1430 from craftcms/bugfix/1427-generate-url-no-fs

Fix #1427
craftcms · May 1, 2024 · 48a98b9 · 48a98b9
2 parents ce96cff + c6ee901
commit 48a98b9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,7 +2,8 @@
 
 ## Unreleased
 
-- Fixed a bug where importing into an entry type with hidden title attribute would cause an error. ([#1423](https://github.com/craftcms/feed-me/pull/1423))
+- Fixed a PHP error that would occur when importing Assets ([#1427](https://github.com/craftcms/feed-me/pull/1427))
+- Fixed a PHP error that could occur when importing into an entry type with a hidden title attribute. ([#1423](https://github.com/craftcms/feed-me/pull/1423))
 
 ## 6.0.0 - 2024-03-19
 

diff --git a/src/helpers/AssetHelper.php b/src/helpers/AssetHelper.php
@@ -117,7 +117,7 @@ public static function indexExistingFile($urlFromFeed, string $conflict, $field
         $asset->folderId = $folder->id;
         $asset->folderPath = $folder->path;
         $asset->volumeId = $volume->id;
-        $targetUrl = AssetsHelper::generateUrl($volume->getFs(), $asset);
+        $targetUrl = AssetsHelper::generateUrl($asset);
 
         $rootUrl = $volume->getRootUrl() ?? '';
         $targetPath = str_replace($rootUrl, '', $targetUrl);