1 files changed, 1 insertions, 16 deletions
diff --git a/app/Controller/Board.php b/app/Controller/Board.php
index 433d3af1..0f38f910 100644
--- a/app/Controller/Board.php
+++ b/app/Controller/Board.php
@@ -26,14 +26,10 @@ class Board extends Base
             $this->forbidden(true);
         }
 
-        list($categories_listing, $categories_description) = $this->category->getBoardCategories($project['id']);
-
         // Display the board with a specific layout
         $this->response->html($this->template->layout('board/public', array(
             'project' => $project,
             'swimlanes' => $this->board->getBoard($project['id']),
-            'categories_listing' => $categories_listing,
-            'categories_description' => $categories_description,
             'title' => $project['name'],
             'description' => $project['description'],
             'no_layout' => true,
@@ -58,15 +54,12 @@ class Board extends Base
         $board_selector = $projects;
         unset($board_selector[$project['id']]);
 
-        list($categories_listing, $categories_description) = $this->category->getBoardCategories($project['id']);
-
         $this->response->html($this->template->layout('board/index', array(
             'users' => $this->projectPermission->getMemberList($project['id'], true, true),
             'projects' => $projects,
             'project' => $project,
             'swimlanes' => $this->board->getBoard($project['id']),
-            'categories_listing' => $categories_listing,
-            'categories_description' => $categories_description,
+            'categories_listing' => $this->category->getList($project['id'], true, true),
             'title' => $project['name'],
             'description' => $project['description'],
             'board_selector' => $board_selector,
@@ -106,14 +99,10 @@ class Board extends Base
             return $this->response->status(400);
         }
 
-        list($categories_listing, $categories_description) = $this->category->getBoardCategories($project_id);
-
         $this->response->html(
             $this->template->render('board/show', array(
                 'project' => $this->project->getById($project_id),
                 'swimlanes' => $this->board->getBoard($project_id),
-                'categories_listing' => $categories_listing,
-                'categories_description' => $categories_description,
                 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
                 'board_highlight_period' => $this->config->get('board_highlight_period'),
             )),
@@ -143,14 +132,10 @@ class Board extends Base
             return $this->response->status(304);
         }
 
-        list($categories_listing, $categories_description) = $this->category->getBoardCategories($project_id);
-
         $this->response->html(
             $this->template->render('board/show', array(
                 'project' => $this->project->getById($project_id),
                 'swimlanes' => $this->board->getBoard($project_id),
-                'categories_listing' => $categories_listing,
-                'categories_description' => $categories_description,
                 'board_private_refresh_interval' => $this->config->get('board_private_refresh_interval'),
                 'board_highlight_period' => $this->config->get('board_highlight_period'),
             ))