From e22f91bacbcc08901839566d3897edad207a7b96 Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Thu, 6 Jul 2023 16:21:10 -0700 Subject: [PATCH 1/2] 4.7.0 --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a0b60adc..b8bba00e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Release Notes for Feed Me 4.x -## Unreleased +## 4.7.0 - 2023-07-06 - 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 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)) From d85c719263946ae78358498deed36eb9ea39312b Mon Sep 17 00:00:00 2001 From: Brad Bell Date: Mon, 24 Jul 2023 20:26:18 -0700 Subject: [PATCH 2/2] Fixed a bug where you could not override feed settings with `false` if you used the `feedOptions` config file. --- CHANGELOG.md | 4 ++++ src/services/Service.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b8bba00e..ebb93c79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Release Notes for Feed Me 4.x +## 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)) + ## 4.7.0 - 2023-07-06 - 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)) diff --git a/src/services/Service.php b/src/services/Service.php index e11ab64f..1fd2dd2f 100644 --- a/src/services/Service.php +++ b/src/services/Service.php @@ -29,7 +29,7 @@ public function getConfig($key, $feedId = null) if ($feedId) { $configFeedItem = Hash::get($settings, 'feedOptions.' . $feedId . '.' . $key); - if ($configFeedItem) { + if (isset($configFeedItem)) { $configItem = $configFeedItem; } }