[bug-OpenMage#897] Category sort doesn't use system config when defau…

…lt_sort_by is not available
edannenberg · Aug 20, 2020 · 7a973d4 · 7a973d4
1 parent 0be31a8
commit 7a973d4
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/app/code/core/Mage/Catalog/Model/Category.php b/app/code/core/Mage/Catalog/Model/Category.php
@@ -918,12 +918,17 @@ public function getAvailableSortByOptions() {
      * @return string
      */
     public function getDefaultSortBy() {
-        if (!$sortBy = $this->getData('default_sort_by')) {
+        $sortBy = $this->getData('default_sort_by');
+        $available = $this->getAvailableSortByOptions();
+
+        // When not set or not available use default from system config
+        if (!$sortBy || !isset($available[$sortBy])) {
             $sortBy = Mage::getSingleton('catalog/config')
                 ->getProductListDefaultSortBy($this->getStoreId());
         }
-        $available = $this->getAvailableSortByOptions();
-        if (!isset($available[$sortBy])) {
+
+        // If even the sort from system config not set or unavailable, use the first of available
+        if (!$sortBy || !isset($available[$sortBy])) {
             $sortBy = array_keys($available);
             $sortBy = $sortBy[0];
         }