Issues-507: Use default order of forums from settings

atelomycterus · atelomycterus · commit e28a3c9d0158 · 2021-03-29T22:45:39.000+03:00
diff --git a/vanilla/applications/vanilla/controllers/class.categoriescontroller.php b/vanilla/applications/vanilla/controllers/class.categoriescontroller.php
@@ -614,7 +614,7 @@ public function all($Category = '', $displayAs = '') {
         }
         // FIX: https://github.com/topcoder-platform/forums/issues/422
         // Sorting for Flat type in SQL
-        if($displayAs != 'Flat') {
+        if($displayAs != 'Flat' && $Category) {
             if ($this->data('CategorySort')) {
                 if ($this->data('CategorySort') == self::SORT_OLDEST_POST) {
                     usort($categoryTree, function ($a, $b) {

Original file line number	Diff line number	Diff line change
`@@ -614,7 +614,7 @@ public function all($Category = '', $displayAs = '') {`
`614`	`614`	`}`
`615`	`615`	`// FIX: https://github.com/topcoder-platform/forums/issues/422`
`616`	`616`	`// Sorting for Flat type in SQL`
`617`		`- if($displayAs != 'Flat') {`
	`617`	`+ if($displayAs != 'Flat' && $Category) {`
`618`	`618`	`if ($this->data('CategorySort')) {`
`619`	`619`	`if ($this->data('CategorySort') == self::SORT_OLDEST_POST) {`
`620`	`620`	`usort($categoryTree, function ($a, $b) {`