Skip to content

Commit

Permalink
Merge branch 'v4' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
angrybrad committed Nov 25, 2023
2 parents 0b6cc61 + 2406c10 commit 3631755
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
- Fixed a bug where importing assets with “Use existing assets” could create duplicate assets. ([#1348](https://github.com/craftcms/feed-me/issues/1348))
- Fixed a bug where importing Address data from the Google Maps plugin could cause duplicate Addresses if the Address already existed. ([#1370](https://github.com/craftcms/feed-me/pull/1370))
- Fixed a bug where updating entry statuses for a site in a site group, would update statuses for all sites in the site group instead of the targeted one. ([#1208](https://github.com/craftcms/feed-me/issues/1208))
- Fixed a bug where you could not use `false` to override feed settings in `config/feed-me.php`. ([#1380](https://github.com/craftcms/feed-me/issues/1380))

## 5.2.0 - 2023-07-06

Expand Down
2 changes: 1 addition & 1 deletion src/services/Feeds.php
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ private function _createModelFromRecord(FeedRecord $record = null): ?FeedModel
foreach ($attributes as $attribute => $value) {
$override = $this->getModelOverrides($attribute, $record['id']);

if ($override) {
if ($override !== null) {
$attributes[$attribute] = $override;
}
}
Expand Down

0 comments on commit 3631755

Please sign in to comment.