- Patch #147034 by webchick: removed redundant dependency checking.
parent
96926ca047
commit
5d35dbd3d4
|
@ -889,7 +889,6 @@ 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);
|
||||||
|
|
||||||
|
@ -901,11 +900,6 @@ function forum_page($tid = 0) {
|
||||||
|
|
||||||
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 ' ';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Format the forum body.
|
* Format the forum body.
|
||||||
|
|
Loading…
Reference in New Issue