MAGETWO-53070: Can not unassign product from all websites

mlogvin · mlogvin · commit 2824ddc706cd · 2016-06-01T14:43:41.000+03:00
diff --git a/app/code/Magento/Catalog/Model/ResourceModel/Product.php b/app/code/Magento/Catalog/Model/ResourceModel/Product.php
@@ -315,8 +315,12 @@ public function delete($object)
      */
     protected function _saveWebsiteIds($product)
     {
-        if (empty(array_diff($product->getWebsiteIds(), [0]))) {
-            $product->setWebsiteIds([1]);
+//        if (empty(array_diff($product->getWebsiteIds(), [0]))) {
+//            $product->setWebsiteIds([1]);
+//        }
+        if ($this->_storeManager->isSingleStoreMode()) {
+            $id = $this->_storeManager->getDefaultStoreView()->getWebsiteId();
+            $product->setWebsiteIds([$id]);
         }
         $websiteIds = $product->getWebsiteIds();
 

Original file line number	Diff line number	Diff line change
`@@ -315,8 +315,12 @@ public function delete($object)`
`315`	`315`	`*/`
`316`	`316`	`protected function _saveWebsiteIds($product)`
`317`	`317`	`{`
`318`		`- if (empty(array_diff($product->getWebsiteIds(), [0]))) {`
`319`		`- $product->setWebsiteIds([1]);`
	`318`	`+// if (empty(array_diff($product->getWebsiteIds(), [0]))) {`
	`319`	`+// $product->setWebsiteIds([1]);`
	`320`	`+// }`
	`321`	`+ if ($this->_storeManager->isSingleStoreMode()) {`
	`322`	`+ $id = $this->_storeManager->getDefaultStoreView()->getWebsiteId();`
	`323`	`+ $product->setWebsiteIds([$id]);`
`320`	`324`	`}`
`321`	`325`	`$websiteIds = $product->getWebsiteIds();`
`322`	`326`