Merge remote-tracking branch 'origin/AC-2904-v1' into spartans_pr_04122023

Author: glo60612

app/code/Magento/Catalog/Model/ProductRepository.php

@@ -526,7 +526,6 @@ public function save(ProductInterface $product, $saveOptions = false)
         $assignToCategories = false;
         $tierPrices = $product->getData('tier_price');
         $productDataToChange = $product->getData();
-
         try {
             $existingProduct = $product->getId() ?
                 $this->getById($product->getId()) :
@@ -597,14 +596,16 @@ public function save(ProductInterface $product, $saveOptions = false)
                 && $product->getStoreId() !== Store::DEFAULT_STORE_ID
                 && (count($stores) > 1 || count($websites) === 1)
             ) {
+                $imageRoles = ['image', 'small_image', 'thumbnail'];
                 foreach ($productAttributes as $attribute) {
                     $attributeCode = $attribute->getAttributeCode();
                     $value = $product->getData($attributeCode);
-                    if ($existingProduct->getData($attributeCode) === $value
+                    if (!in_array($attributeCode, $imageRoles)
+                        && $existingProduct->getData($attributeCode) === $value
+                        && $existingProduct->getOrigData($attributeCode) === $value
                         && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
                         && !is_array($value)
                         && !$attribute->isStatic()
-                        && !array_key_exists($attributeCode, $productDataToChange)
                         && $value !== null
                         && !$this->scopeOverriddenValue->containsValue(
                             ProductInterface::class,
@@ -618,6 +619,21 @@ public function save(ProductInterface $product, $saveOptions = false)
                             $attributeCode === ProductAttributeInterface::CODE_SEO_FIELD_URL_KEY ? false : null
                         );
                         $hasDataChanged = true;
+                    } elseif (in_array($attributeCode, $imageRoles)
+                        && $existingProduct->getData($attributeCode) === $value
+                        && !array_key_exists($attributeCode, $productDataToChange)
+                        && $attribute->getScope() !== EavAttributeInterface::SCOPE_GLOBAL_TEXT
+                        && $value !== null
+                        && !$this->scopeOverriddenValue->containsValue(
+                            ProductInterface::class,
+                            $product,
+                            $attributeCode,
+                            $product->getStoreId()
+                        )
+
+                    ) {
+                        $product->setData($attributeCode, null);
+                        $hasDataChanged = true;
                     }
                 }
                 if ($hasDataChanged) {

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryMultiWebsiteTest.php

@@ -188,26 +188,17 @@ public function testProductDefaultValuesWithTwoWebsites(): void
         /** @var ScopeOverriddenValue $scopeOverriddenValue */
         $scopeOverriddenValue = $this->objectManager->get(ScopeOverriddenValue::class);
         $storeId = $store->load('fixture_third_store', 'code')->getId();
-        $this->assertFalse($scopeOverriddenValue->containsValue(
-            ProductInterface::class,
-            $product,
-            'visibility',
-            $storeId
-        ));
-
-        $this->assertFalse($scopeOverriddenValue->containsValue(
-            ProductInterface::class,
-            $product,
-            'tax_class_id',
-            $storeId
-        ));
 
-        $this->assertFalse($scopeOverriddenValue->containsValue(
-            ProductInterface::class,
-            $product,
-            'status',
-            $storeId
-        ));
+        $attributeCodeList = ['visibility', 'tax_class_id', 'status', 'short_description', 'description',
+                           'url_key', 'meta_title', 'meta_keywords', 'meta_description'];
+        foreach ($attributeCodeList as $attributeCode) {
+            $this->assertFalse($scopeOverriddenValue->containsValue(
+                ProductInterface::class,
+                $product,
+                $attributeCode,
+                $storeId
+            ));
+        }
     }
 
     /**