From 7ed3cf3b133aa980f110ebf6585d69448e2cb6ef Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 10 Oct 2009 21:39:03 +0000
Subject: #569238 by sun, swentel, catch: Changed Make check_markup() not cache
 by default.

---
 modules/comment/comment.module     | 4 ++--
 modules/comment/comment.tokens.inc | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules/comment')

diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index 93958f37a..04e8fe200 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -841,7 +841,7 @@ function comment_build_content($comment, $node, $build_mode = 'full') {
 
   // Build comment body.
   $comment->content['comment_body'] = array(
-    '#markup' => check_markup($comment->comment, $comment->format),
+    '#markup' => check_markup($comment->comment, $comment->format, '', TRUE),
   );
 
   $comment->content += field_attach_view('comment', $comment, $build_mode);
@@ -1158,7 +1158,7 @@ function comment_node_update_index($node) {
       ':status' => COMMENT_PUBLISHED
     ));
     foreach ($comments as $comment) {
-      $text .= '<h2>' . check_plain($comment->subject) . '</h2>' . check_markup($comment->comment, $comment->format);
+      $text .= '<h2>' . check_plain($comment->subject) . '</h2>' . check_markup($comment->comment, $comment->format, '', TRUE);
     }
   }
   return $text;
diff --git a/modules/comment/comment.tokens.inc b/modules/comment/comment.tokens.inc
index 3f5590ee6..8ca74fa70 100644
--- a/modules/comment/comment.tokens.inc
+++ b/modules/comment/comment.tokens.inc
@@ -175,7 +175,7 @@ function comment_tokens($type, $tokens, array $data = array(), array $options =
           break;
 
         case 'body':
-          $replacements[$original] = $sanitize ? check_markup($comment->comment, $comment->format) : $replacements[$original] = $comment->comment;
+          $replacements[$original] = $sanitize ? check_markup($comment->comment, $comment->format, '', TRUE) : $comment->comment;
           break;
 
         // Comment related URLs.
-- 
cgit v1.2.3