AC-2904-v1::Saving product with non-default store scope causes untouched attributes to become store scoped if loaded using ProductRepository

glo63652 · glo63652 · commit 1fad1903360f · 2023-11-08T17:17:25.000+05:30
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -639,21 +639,20 @@ public function save(ProductInterface $product, $saveOptions = false)
                         $hasDataChanged = true;
                     }
                 }
+                $productDataArray = $this->attributeFilter->prepareProductAttributes(
+                    $product,
+                    $productDataArray,
+                    $useDefault
+                );
+                $product->setData($productDataArray);
+
                 if ($hasDataChanged) {
                     $product->setData('_edit_mode', true);
                 }
             }
         }
 
-        $productDataArray = $this->attributeFilter->prepareProductAttributes(
-            $product,
-            $productDataArray,
-            $useDefault
-        );
-        $newProduct = $this->productFactory->create();
-        $newProduct->setData($productDataArray);
-
-        $this->saveProduct($newProduct);
+        $this->saveProduct($product);
 
         if ($assignToCategories === true && $product->getCategoryIds()) {
             $this->linkManagement->assignProductToCategories(

Original file line number	Diff line number	Diff line change
`@@ -639,21 +639,20 @@ public function save(ProductInterface $product, $saveOptions = false)`
`639`	`639`	`$hasDataChanged = true;`
`640`	`640`	`}`
`641`	`641`	`}`
	`642`	`+ $productDataArray = $this->attributeFilter->prepareProductAttributes(`
	`643`	`+ $product,`
	`644`	`+ $productDataArray,`
	`645`	`+ $useDefault`
	`646`	`+ );`
	`647`	`+ $product->setData($productDataArray);`
	`648`	`+`
`642`	`649`	`if ($hasDataChanged) {`
`643`	`650`	`$product->setData('_edit_mode', true);`
`644`	`651`	`}`
`645`	`652`	`}`
`646`	`653`	`}`
`647`	`654`
`648`		`- $productDataArray = $this->attributeFilter->prepareProductAttributes(`
`649`		`- $product,`
`650`		`- $productDataArray,`
`651`		`- $useDefault`
`652`		`- );`
`653`		`- $newProduct = $this->productFactory->create();`
`654`		`- $newProduct->setData($productDataArray);`
`655`		`-`
`656`		`- $this->saveProduct($newProduct);`
	`655`	`+ $this->saveProduct($product);`
`657`	`656`
`658`	`657`	`if ($assignToCategories === true && $product->getCategoryIds()) {`
`659`	`658`	`$this->linkManagement->assignProductToCategories(`