Done #2873 @0.25

diff --git a/framework/application/views/helpers/CategoriesFilter.php b/framework/application/views/helpers/CategoriesFilter.php
index b5711cebe2ef189fc7a2aac3dcc93049aade0152..855fd5e1644cc7512444114f84a7499e606c4caf 100644 (file)
--- a/framework/application/views/helpers/CategoriesFilter.php
+++ b/framework/application/views/helpers/CategoriesFilter.php
@@ -33,20 +33,29 @@ class Cubedesigners_View_Helper_CategoriesFilter extends CubeIT_View_Helper_Abst
 
         $query = $select->query();
 
-               $categories = [
-                   '' => __('Choisir un domaine...'),
-                   '0' => __('Tout voir')
-        ];
+               $populated_categories = [];
                while ($row = $query->fetch()) {
 
                    $row = CubeIT_Util_Cms::unserialize($row);
 
             foreach ($row->categories as $category) {
-                $categories[$category] = $all_categories[$category]->name;
+                $populated_categories[$category] = $all_categories[$category]->name;
                    }
 
                }
 
+               // Sort final list of categories based on proper order from admin
+        $sorted_categories = [
+            '' => __('Choisir un domaine...'),
+            '0' => __('Tout voir')
+        ];
+               // $all_categories is already sorted correctly so we'll use that to build the final list
+               foreach ($all_categories as $category_ID => $category) {
+                   if (isset($populated_categories[$category_ID])) {
+                       $sorted_categories[$category_ID] = $category->name;
+            }
+        }
+
                return $this->formSelect(
                    $listID . '-filter', // Select element's name
             null, // Value
@@ -57,7 +66,7 @@ class Cubedesigners_View_Helper_CategoriesFilter extends CubeIT_View_Helper_Abst
                 'data-column-width' => $columnWidth,
                 'data-gutter' => $gutterSize
             ],
-            $categories // Options
+            $sorted_categories // Options
         );
        }