Merge remote-tracking branch 'origin/MAGETWO-53070' into pr

Author: olysenko

app/code/Magento/Catalog/Controller/Adminhtml/Product/Initialization/Helper.php

@@ -170,10 +170,6 @@ public function initializeFromData(\Magento\Catalog\Model\Product $product, arra
             $product->lockAttribute('media');
         }
 
-        if ($this->storeManager->hasSingleStore() && empty($product->getWebsiteIds())) {
-            $product->setWebsiteIds([$this->storeManager->getStore(true)->getWebsite()->getId()]);
-        }
-
         /**
          * Check "Use Default Value" checkboxes values
          */

app/code/Magento/Catalog/Model/ResourceModel/Product.php

@@ -315,8 +315,9 @@ public function delete($object)
      */
     protected function _saveWebsiteIds($product)
     {
-        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();