summaryrefslogtreecommitdiff
path: root/modules/forum.module
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2005-01-22 08:38:25 +0000
committerDries Buytaert <dries@buytaert.net>2005-01-22 08:38:25 +0000
commitaacfec0fc1dba0ad5130a32c2b55cbead761e6ff (patch)
treeec8b2a86d20654f74a3e8a55e57c8f08818797b6 /modules/forum.module
parent630dcebf43d216ff7f865301da004750110cf0e1 (diff)
downloadbrdo-aacfec0fc1dba0ad5130a32c2b55cbead761e6ff.tar.gz
brdo-aacfec0fc1dba0ad5130a32c2b55cbead761e6ff.tar.bz2
- Patch #15978 by Drumm: code improvement: theme_forum_display() has no business calling theme_page(). Lets have it return the output and then forum_page() can put it in a page.
Diffstat (limited to 'modules/forum.module')
-rw-r--r--modules/forum.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/forum.module b/modules/forum.module
index d9973222e..cf65e1c6e 100644
--- a/modules/forum.module
+++ b/modules/forum.module
@@ -504,7 +504,7 @@ function forum_page($tid = 0) {
$topics = forum_get_topics($tid, $sortby, $forum_per_page);
}
- print theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page);
+ print theme('page', theme('forum_display', $forums, $topics, $parents, $tid, $sortby, $forum_per_page));
}
else {
drupal_set_title(t('Warning'));
@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p
$output = '';
}
- print theme('page', $output);
+ return $output;
}
/**