Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #147034 by webchick: removed redundant dependency checking.

6.x
Dries Buytaert 2007-05-28 06:19:05 +00:00
parent 96926ca047
commit 5d35dbd3d4
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/forum/forum.module
View File

@ -889,22 +889,16 @@ function _forum_new($tid) {
* Menu callback; prints a forum listing. * Menu callback; prints a forum listing.
*/ */
function forum_page($tid = 0) { function forum_page($tid = 0) {
if (module_exists('taxonomy') && module_exists('comment')) { $forum_per_page = variable_get('forum_per_page', 25);
$forum_per_page = variable_get('forum_per_page', 25); $sortby = variable_get('forum_order', 1);
$sortby = variable_get('forum_order', 1);
$forums = forum_get_forums($tid); $forums = forum_get_forums($tid);
$parents = taxonomy_get_parents_all($tid); $parents = taxonomy_get_parents_all($tid);
if ($tid && !in_array($tid, variable_get('forum_containers', array()))) { if ($tid && !in_array($tid, variable_get('forum_containers', array()))) {
$topics = forum_get_topics($tid, $sortby, $forum_per_page); $topics = forum_get_topics($tid, $sortby, $forum_per_page);
} }
return theme('forum_display', $forums, $topics, $parents, $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 ' ';
}
} }
/** /**