Commit aacfec0f authored by Dries's avatar Dries

- Patch #15978 by Drumm: code improvement: theme_forum_display() has no...

- 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.
parent 630dcebf
...@@ -504,7 +504,7 @@ function forum_page($tid = 0) { ...@@ -504,7 +504,7 @@ function forum_page($tid = 0) {
$topics = forum_get_topics($tid, $sortby, $forum_per_page); $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 { else {
drupal_set_title(t('Warning')); drupal_set_title(t('Warning'));
...@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p ...@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p
$output = ''; $output = '';
} }
print theme('page', $output); return $output;
} }
/** /**
......
...@@ -504,7 +504,7 @@ function forum_page($tid = 0) { ...@@ -504,7 +504,7 @@ function forum_page($tid = 0) {
$topics = forum_get_topics($tid, $sortby, $forum_per_page); $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 { else {
drupal_set_title(t('Warning')); drupal_set_title(t('Warning'));
...@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p ...@@ -579,7 +579,7 @@ function theme_forum_display($forums, $topics, $parents, $tid, $sortby, $forum_p
$output = ''; $output = '';
} }
print theme('page', $output); return $output;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment