Merge branch 'v4' into develop

# Conflicts: # CHANGELOG.md
craftcms · Jul 25, 2023 · 1fa4cf3 · 1fa4cf3
2 parents 98dcf59 + d85c719
commit 1fa4cf3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Release Notes for Feed Me
 
+## Unreleased
+
+- Fixed a bug where you could not override feed settings with `false` if you used the `feedOptions` config file. ([#1352](https://github.com/craftcms/feed-me/issues/1352))
+
 ## 5.2.0 - 2023-07-06
 
-- Improved the localization experience when importing into a Money field. ([#1315](https://github.com/craftcms/feed-me/issues/1315))
 - The “Create if they do not exist” setting on a feed’s mapping now conditionally show/hide the checkbox for Categories, Entries and Users relation fields. ([#1077](https://github.com/craftcms/feed-me/issues/1077))
 - Fixed a bug where `setEmptyValues` wasn’t being respected when mapping Redactor and CKEditor fields. ([#1321](https://github.com/craftcms/feed-me/issues/1321))
 - Fixed a bug where an element’s status would not update on a multi-site install if the status was the only thing that changed. ([#1310](https://github.com/craftcms/feed-me/issues/1310))

diff --git a/src/services/Service.php b/src/services/Service.php
@@ -32,7 +32,7 @@ public function getConfig($key, $feedId = null): mixed
         if ($feedId) {
             $configFeedItem = Hash::get($settings, 'feedOptions.' . $feedId . '.' . $key);
 
-            if ($configFeedItem) {
+            if (isset($configFeedItem)) {
                 $configItem = $configFeedItem;
             }
         }