Merge commit 'refs/pull/5145/head' of https://github.com/magento/magento2 into MAGETWO-58941

viktym · viktym · commit a1a3c72fc27f · 2016-09-26T14:57:05.000+03:00
diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Status.php b/app/code/Magento/CatalogInventory/Model/Stock/Status.php
@@ -100,7 +100,7 @@ public function getWebsiteId()
      */
     public function getStockId()
     {
-        return $this->getData(self::KEY_WEBSITE_ID);
+        return $this->getData(self::KEY_STOCK_ID);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ public function getWebsiteId()`
`100`	`100`	`*/`
`101`	`101`	`public function getStockId()`
`102`	`102`	`{`
`103`		`- return $this->getData(self::KEY_WEBSITE_ID);`
	`103`	`+ return $this->getData(self::KEY_STOCK_ID);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/**`