Merge branch '5.x' into 6.x

# Conflicts: # CHANGELOG.md # src/fields/Categories.php
craftcms · Nov 27, 2024 · 2f1786d · 2f1786d
2 parents 7e0ec3d + d4c4d21
commit 2f1786d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ## Unreleased
 
 - Added the `assetDownloadGuzzle` config setting which defaults to `false`. When it is set to `true`, Feed Me will use Guzzle to download assets instead curl directly. ([#1549](https://github.com/craftcms/feed-me/pull/1549))
-- Imported Commerce Products now add a single Catalog Pricing job to the queue after an import, instead of one per Product. ([#1547](https://github.com/craftcms/feed-me/pull/1547)) 
+- Imported Commerce Products now add a single Catalog Pricing job to the queue after an import, instead of one per Product. ([#1547](https://github.com/craftcms/feed-me/pull/1547))
+- Fixed a bug where importing matching Categories could go awry if the source of the field is set to a group and not a custom source. ([#1550](https://github.com/craftcms/feed-me/pull/1550))
 
 ## 6.5.0 - 2024-10-15
 

diff --git a/src/fields/Categories.php b/src/fields/Categories.php
@@ -143,6 +143,10 @@ public function parseField(): mixed
                 }
             }
 
+            if ($groupId) {
+                $criteria['groupId'] = $groupId;
+            }
+
             $criteria['status'] = null;
             $criteria['limit'] = $limit;
             $criteria[$match] = $dataValue;