Merge branch '5.x' into 6.x

# Conflicts: # CHANGELOG.md
craftcms · Jul 18, 2024 · 237c9ac · 237c9ac
2 parents 4d55d26 + 09a5995
commit 237c9ac
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Release Notes for Feed Me
 
+## Unreleased
+
+- Fixed a PHP error that could occur when importing Assets that had a missing filename. ([#1481](https://github.com/craftcms/feed-me/pull/1481))
+
 ## 6.2.0 - 2024-07-09
 
 > **Warning**

diff --git a/src/fields/Assets.php b/src/fields/Assets.php
@@ -118,8 +118,10 @@ public function parseField(): mixed
         $base64ToUpload = [];
 
         $filenamesFromFeed = $upload ? DataHelper::fetchArrayValue($this->feedData, $this->fieldInfo, 'options.filenameNode') : null;
-        // see https://github.com/craftcms/feed-me/issues/1471
-        $filenamesFromFeed = array_splice($filenamesFromFeed, $nodeKey, count($value));
+        if ($filenamesFromFeed) {
+            // see https://github.com/craftcms/feed-me/issues/1471
+            $filenamesFromFeed = array_splice($filenamesFromFeed, $nodeKey, count($value));
+        }
 
         // Fire an 'onAssetFilename' event
         $event = new AssetFilenameEvent([

diff --git a/src/templates/_includes/fields/assets.html b/src/templates/_includes/fields/assets.html
@@ -75,7 +75,7 @@
                 label: 'Use this filename for assets created from URL:'|t('feed-me'),
                 name: 'options[filenameNode]',
                 value: hash_get(feed.fieldMapping, optionsPath ~ '.filenameNode') ?: '',
-                options: feedData,
+                options: feedData|filter(option => option.value != 'usedefault'),
                 class: 'selectize fullwidth',
             }) }}
         </div>