diff options
Diffstat (limited to 'modules/forum/forum.module')
| -rw-r--r-- | modules/forum/forum.module | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 5bedba1f2..e61d47be7 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -538,14 +538,13 @@ function forum_block_view($delta = '') { break; } - $cache_keys[] = 'forum'; - $cache_keys[] = $delta; - // Cache based on the altered query. Enables us to cache with node access enabled. - $query->preExecute(); - $cache_keys[] = md5(serialize(array((string) $query, $query->getArguments()))); - - $block['subject'] = $title; - $block['content'] = array( + $cache_keys = array_merge(array('forum', $delta), drupal_render_cid_parts()); + // Cache based on the altered query. Enables us to cache with node access enabled. + $query->preExecute(); + $cache_keys[] = md5(serialize(array((string) $query, $query->getArguments()))); + + $block['subject'] = $title; + $block['content'] = array( '#access' => user_access('access content'), '#pre_render' => array('forum_block_view_pre_render'), '#cache' => array( @@ -553,8 +552,8 @@ function forum_block_view($delta = '') { 'expire' => CACHE_TEMPORARY, ), '#query' => $query, - ); - return $block; + ); + return $block; } /** |