From aacfec0fc1dba0ad5130a32c2b55cbead761e6ff Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sat, 22 Jan 2005 08:38:25 +0000
Subject: [PATCH] - 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.
---
modules/forum.module | 4 ++--
modules/forum/forum.module | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/forum.module b/modules/forum.module
index d9973222eaf2..cf65e1c6ecdd 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;
}
/**
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index d9973222eaf2..cf65e1c6ecdd 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/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;
}
/**
--
GitLab