Merge 2.4-develop and Fixed conflicts

engcom-Echo · engcom-Echo · commit 4e85f7ee546d · 2023-01-04T11:40:31.000+05:30
diff --git a/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php b/app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php
@@ -166,7 +166,7 @@ public function generateForGlobalScope($productCategories, Product $product, $ro
                 } else {
                     $scopedProduct = $this->productRepository->getById($productId, false, $id);
                     $mergeDataProvider->merge(
-                        $this->generateForSpecificStoreView($id, $productCategories, $scopedProduct, $rootCategoryId, true)
+                        $this->generateForSpecificStoreView($id, $productCategories, $scopedProduct, $rootCategoryId)
                     );
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ public function generateForGlobalScope($productCategories, Product $product, $ro`
`166`	`166`	`} else {`
`167`	`167`	`$scopedProduct = $this->productRepository->getById($productId, false, $id);`
`168`	`168`	`$mergeDataProvider->merge(`
`169`		`- $this->generateForSpecificStoreView($id, $productCategories, $scopedProduct, $rootCategoryId, true)`
	`169`	`+ $this->generateForSpecificStoreView($id, $productCategories, $scopedProduct, $rootCategoryId)`
`170`	`170`	`);`
`171`	`171`	`}`
`172`	`172`	`}`