From 6764b73ffd00db0cbba3f45d8b374bcd6a18d9d4 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 11 Sep 2009 15:39:48 +0000
Subject: - Patch #570930 by sun: allow to retrieve all filters (including
 disabled) in a text format.

---
 modules/forum/forum.module | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'modules/forum/forum.module')

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;
 }
 
 /**
-- 
cgit v1.2.3