MAGETWO-75329: Make default sorting fully working when setup on category level #10937

Author: vrann

app/code/Magento/Catalog/Helper/Product/ProductList.php

@@ -30,6 +30,11 @@ class ProductList
      */
     protected $scopeConfig;
 
+    /**
+     * @var \Magento\Framework\Registry
+     */
+    private $coreRegistry;
+
     /**
      * Default limits per page
      *
@@ -41,9 +46,11 @@ class ProductList
      * @param \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
      */
     public function __construct(
-        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig
+        \Magento\Framework\App\Config\ScopeConfigInterface $scopeConfig,
+        \Magento\Framework\Registry $coreRegistry = null
     ) {
         $this->scopeConfig = $scopeConfig;
+        $this->coreRegistry = $coreRegistry ?: \Magento\Framework\App\ObjectManager::getInstance()->get(\Magento\Framework\Registry::class);
     }
 
     /**
@@ -97,6 +104,11 @@ public function getDefaultViewMode($options = [])
      */
     public function getDefaultSortField()
     {
+        $currentCategory = $this->coreRegistry->registry('current_category');
+        if ($currentCategory) {
+            return $currentCategory->getDefaultSortBy();
+        }
+
         return $this->scopeConfig->getValue(
             \Magento\Catalog\Model\Config::XML_PATH_LIST_DEFAULT_SORT_BY,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE