summaryrefslogtreecommitdiff
path: root/modules/forum
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-05-29 07:53:44 +0000
committerDries Buytaert <dries@buytaert.net>2010-05-29 07:53:44 +0000
commitada6432e5e8844e9d0c8ce42e7ee5d88c9224ef9 (patch)
treec782c1215efd9f82c516608cd62ed7e56cdd4e4d /modules/forum
parent3d2110bfdb8d12e40d4093e0050a14301b0e36d5 (diff)
downloadbrdo-ada6432e5e8844e9d0c8ce42e7ee5d88c9224ef9.tar.gz
brdo-ada6432e5e8844e9d0c8ce42e7ee5d88c9224ef9.tar.bz2
- Patch #809558 by mr.baileys: node_title_list() didn't return renderable array for block content.
Diffstat (limited to 'modules/forum')
-rw-r--r--modules/forum/forum.module4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module
index ea7f77f07..9984787e6 100644
--- a/modules/forum/forum.module
+++ b/modules/forum/forum.module
@@ -699,8 +699,8 @@ function forum_block_view($delta = '') {
function forum_block_view_pre_render($elements) {
$result = $elements['#query']->execute();
if ($node_title_list = node_title_list($result)) {
- $elements['forum_list'] = array('#markup' => $node_title_list);
- $elements['forum_more'] = array('#markup' => theme('more_link', array('url' => url('forum'), 'title' => t('Read the latest forum topics.'))));
+ $elements['forum_list'] = $node_title_list;
+ $elements['forum_more'] = array('#theme' => 'more_link', '#url' => url('forum'), '#title' => t('Read the latest forum topics.'));
}
return $elements;
}