Merge branch 'MC-25265' of https://github.com/magento-tango/magento2ce into 2.4-develop

Roman Lytvynenko · Roman Lytvynenko · commit 8f64121fc26c · 2020-02-03T14:29:44.000-06:00
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php b/app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php
@@ -2121,7 +2121,9 @@ private function getChildrenCategories(int $categoryId): array
                 if (in_array($category['parent_id'], $categoryIds)
                     && in_array($category['parent_id'], $anchorCategory)) {
                     $categoryIds[] = (int)$category[$linkField];
-                    if ($category['is_anchor'] == 1) {
+                    // Storefront approach is to treat non-anchor children of anchor category as anchors.
+                    // Adding their's IDs to $anchorCategory for consistency.
+                    if ($category['is_anchor'] == 1 || in_array($category['parent_id'], $anchorCategory)) {
                         $anchorCategory[] = (int)$category[$linkField];
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -2121,7 +2121,9 @@ private function getChildrenCategories(int $categoryId): array`
`2121`	`2121`	`if (in_array($category['parent_id'], $categoryIds)`
`2122`	`2122`	`&& in_array($category['parent_id'], $anchorCategory)) {`
`2123`	`2123`	`$categoryIds[] = (int)$category[$linkField];`
`2124`		`- if ($category['is_anchor'] == 1) {`
	`2124`	`+ // Storefront approach is to treat non-anchor children of anchor category as anchors.`
	`2125`	`+ // Adding their's IDs to $anchorCategory for consistency.`
	`2126`	`+ if ($category['is_anchor'] == 1 \|\| in_array($category['parent_id'], $anchorCategory)) {`
`2125`	`2127`	`$anchorCategory[] = (int)$category[$linkField];`
`2126`	`2128`	`}`
`2127`	`2129`	`}`