Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-…

…bugs
magento · Aug 14, 2017 · 1739b66 · 1739b66
2 parents 64debfd + eed81bf
commit 1739b66
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 404 deletions.
diff --git a/app/code/Magento/Catalog/Model/ProductRepository.php b/app/code/Magento/Catalog/Model/ProductRepository.php
@@ -641,7 +641,7 @@ public function save(\Magento\Catalog\Api\Data\ProductInterface $product, $saveO
         }
         unset($this->instances[$product->getSku()]);
         unset($this->instancesById[$product->getId()]);
-        return $this->get($product->getSku());
+        return $this->get($product->getSku(), false, $product->getStoreId());
     }
 
     /**

diff --git a/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php b/app/code/Magento/Catalog/Test/Unit/Model/ProductRepositoryTest.php
@@ -193,7 +193,8 @@ protected function setUp()
                 'validate',
                 'save',
                 'getMediaGalleryEntries',
-                'setData'
+                'setData',
+                'getStoreId'
             ]);
         $this->initializedProductMock->expects($this->any())
             ->method('hasGalleryAttribute')

diff --git a/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php b/app/code/Magento/CatalogInventory/Model/Plugin/AroundProductRepositorySave.php