Merge branch '5.x' into 6.x

craftcms · Jul 18, 2024 · 9a3d69b · 9a3d69b
2 parents 237c9ac + 01e9123
commit 9a3d69b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 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))
+- Fixed a bug that could occur when importing into a Dropdown field that did not support empty strings as a value and the feed had an empty string. ([#1484](https://github.com/craftcms/feed-me/pull/1484))
 
 ## 6.2.0 - 2024-07-09
 

diff --git a/src/fields/Dropdown.php b/src/fields/Dropdown.php
@@ -67,7 +67,7 @@ public function parseField(): mixed
             }
         }
 
-        if (empty($value)) {
+        if ($this->feed['setEmptyValues'] === 1 && $value === '') {
             return $value;
         }