MAGETWO-96377: Product unassigned from category when store view order is changed

Author: nikita-shcherbatykh

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

@@ -486,14 +486,14 @@ public function getProductsPosition($category)
             $this->getCategoryProductTable(),
             ['product_id', 'position']
         )->where(
-            'catalog_category_product.category_id = ?',
+            "{$this->getTable('catalog_category_product')}.category_id = ?",
             $category->getId()
         );
         $websiteId = $category->getStore()->getWebsiteId();
         if ($websiteId) {
             $select->join(
                 ['product_website' => $this->getTable('catalog_product_website')],
-                'product_website.product_id = catalog_category_product.product_id',
+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
                 []
             )->where(
                 'product_website.website_id = ?',

app/code/Magento/Catalog/Model/ResourceModel/Category/Flat.php

@@ -699,14 +699,14 @@ public function getProductsPosition($category)
             $this->getTable('catalog_category_product'),
             ['product_id', 'position']
         )->where(
-            'catalog_category_product.category_id = ?',
+            "{$this->getTable('catalog_category_product')}.category_id = ?",
             $category->getId()
         );
         $websiteId = $category->getStore()->getWebsiteId();
         if ($websiteId) {
             $select->join(
                 ['product_website' => $this->getTable('catalog_product_website')],
-                'product_website.product_id = catalog_category_product.product_id',
+                "product_website.product_id = {$this->getTable('catalog_category_product')}.product_id",
                 []
             )->where(
                 'product_website.website_id = ?',