diff options
Diffstat (limited to 'modules/forum/forum.pages.inc')
| -rw-r--r-- | modules/forum/forum.pages.inc | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/modules/forum/forum.pages.inc b/modules/forum/forum.pages.inc index 6b01048da..02c780136 100644 --- a/modules/forum/forum.pages.inc +++ b/modules/forum/forum.pages.inc @@ -9,16 +9,21 @@ /** * Menu callback; prints a forum listing. */ -function forum_page($tid = 0) { - $topics = ''; +function forum_page($forum_term = NULL) { + if (!isset($forum_term)) { + // On the main page, display all the top-level forums. + $forum_term = forum_forum_load(0); + } + $forum_per_page = variable_get('forum_per_page', 25); $sortby = variable_get('forum_order', 1); - $forums = forum_get_forums($tid); - $parents = taxonomy_get_parents_all($tid); - if ($tid && !in_array($tid, variable_get('forum_containers', array()))) { - $topics = forum_get_topics($tid, $sortby, $forum_per_page); + if (empty($forum_term->container)) { + $topics = forum_get_topics($forum_term->tid, $sortby, $forum_per_page); + } + else { + $topics = ''; } - return theme('forums', array('forums' => $forums, 'topics' => $topics, 'parents' => $parents, 'tid' => $tid, 'sortby' => $sortby, 'forums_per_page' => $forum_per_page)); + return theme('forums', array('forums' => $forum_term->forums, 'topics' => $topics, 'parents' => $forum_term->parents, 'tid' => $forum_term->tid, 'sortby' => $sortby, 'forums_per_page' => $forum_per_page)); } |