diff options
| author | Dries Buytaert <dries@buytaert.net> | 2007-05-28 06:19:05 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2007-05-28 06:19:05 +0000 |
| commit | 5d35dbd3d4fe638a50e7fd80a9681dd2795d808b (patch) | |
| tree | e4a12322089028ce945a3cd1bee69c38bb06ded6 /modules | |
| parent | 96926ca04707d6eda0e96b2ae7eb01efb708c3ec (diff) | |
| download | brdo-5d35dbd3d4fe638a50e7fd80a9681dd2795d808b.tar.gz brdo-5d35dbd3d4fe638a50e7fd80a9681dd2795d808b.tar.bz2 | |
- Patch #147034 by webchick: removed redundant dependency checking.
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/forum/forum.module | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module index a7c1a48fc..43bb88c17 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -889,22 +889,16 @@ function _forum_new($tid) { * Menu callback; prints a forum listing. */ function forum_page($tid = 0) { - if (module_exists('taxonomy') && module_exists('comment')) { - $forum_per_page = variable_get('forum_per_page', 25); - $sortby = variable_get('forum_order', 1); + $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); - } - - return theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page); - } - else { - drupal_set_message(t('The forum module requires both the taxonomy module and the comment module to be enabled and configured.'), 'error'); - return ' '; + $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); } + + return theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page); } /** |