MAGETWO-36369: [GitHub] Unable to save product per website wise #1245

Author: Maksym Aposov

app/code/Magento/CatalogUrlRewrite/Model/ProductUrlPathGenerator.php

@@ -77,15 +77,9 @@ public function getUrlPath($product, $category = null)
      */
     protected function _prepareProductDefaultUrlKey(\Magento\Catalog\Model\Product $product)
     {
-        $storedProduct = $this->productRepository->getById($product->getId(), false, Store::DEFAULT_STORE_ID);
+        $storedProduct = $this->productRepository->getById($product->getId(), false, Store::DEFAULT_STORE_ID, true);
         $storedUrlKey = $storedProduct->getUrlKey();
-        $result = null;
-        if ($storedUrlKey !== false) {
-            $result = $storedUrlKey;
-        } else {
-            $result = $product->formatUrlKey($storedProduct->getName());
-        }
-        return $result;
+        return $storedUrlKey ?: $product->formatUrlKey($storedProduct->getName());
     }
 
     /**