Merge branch '5.x' into 6.x

Author: angrybrad

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Multiple feeds queued via a single CLI command are now processed sequentially, even if they’re batched. ([#1695](https://github.com/craftcms/feed-me/issues/1695))
 - Feed Me CLI commands now support Craft’s `--isolated` flag to ensure they execute in one environment in a multi-compute setup. ([#1676](https://github.com/craftcms/feed-me/issues/1676))
+- Fixed a PHP error that could occur on the field mapping screen if you have a feed that references an asset as a default value for an asset field, and that asset was deleted. ([#1699](https://github.com/craftcms/feed-me/pull/1699))
 
 ## 6.10.2 - 2025-10-23
 

src/templates/_includes/fields/_base.html

@@ -183,7 +183,10 @@
                             {% set elements = [] %}
 
                             {% for elementId in defaultValue %}
-                                {% set elements = elements|merge([ craft.app.elements.getElementById(elementId) ]) %}
+                                {% set element = craft.app.elements.getElementById(elementId) %}
+                                {% if element is not empty %}
+                                    {% set elements = elements|merge([element]) %}
+                                {% endif %}
                             {% endfor %}
 
                             {{ forms.elementSelectField({