diff --git a/phpmyfaq/src/phpMyFAQ/Category/Order.php b/phpmyfaq/src/phpMyFAQ/Category/Order.php index 35fa74c95f..49c061ce79 100644 --- a/phpmyfaq/src/phpMyFAQ/Category/Order.php +++ b/phpmyfaq/src/phpMyFAQ/Category/Order.php @@ -127,11 +127,11 @@ public function getCategoryTree(array $categories, int $parentId = 0): array foreach ($categories as $category) { if ((int) $category['parent_id'] === $parentId) { - $children = $this->getCategoryTree($categories, $category['category_id']); - $result[$category['category_id']] = $children; + $children = $this->getCategoryTree($categories, $category['id']); + $result[$category['id']] = $children; } } - + return $result; } diff --git a/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php b/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php index 66c053b38d..8b2d92893f 100644 --- a/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php +++ b/phpmyfaq/src/phpMyFAQ/Controller/Administration/CategoryController.php @@ -59,8 +59,9 @@ public function index(Request $request): Response $session = $this->container->get('session'); $categoryOrder = $this->container->get('phpmyfaq.category.order'); - $orderedCategories = $categoryOrder->getAllCategories(); - $categoryTree = $categoryOrder->getCategoryTree($orderedCategories); + $orderedCategories = $categoryOrder->getAllCategories(); + $categoryTree = $categoryOrder->getCategoryTree($categoryInfo); + if (empty($categoryTree)) { // Fallback if no category order is available