4 files changed, 8 insertions, 0 deletions
diff --git a/modules/comment.module b/modules/comment.module
index b4c333a4b..2016cdf99 100644
--- a/modules/comment.module
+++ b/modules/comment.module
@@ -359,6 +359,7 @@ function comment_view($comment, $links = "", $visible = 1) {
   print "<a name=\"$comment->cid\"></a>\n";
 
   if ($visible) {
+    $comment->comment = check_output($comment);
     theme("comment", $comment, $links);
   }
   else {
diff --git a/modules/comment/comment.module b/modules/comment/comment.module
index b4c333a4b..2016cdf99 100644
--- a/modules/comment/comment.module
+++ b/modules/comment/comment.module
@@ -359,6 +359,7 @@ function comment_view($comment, $links = "", $visible = 1) {
   print "<a name=\"$comment->cid\"></a>\n";
 
   if ($visible) {
+    $comment->comment = check_output($comment);
     theme("comment", $comment, $links);
   }
   else {
diff --git a/modules/node.module b/modules/node.module
index 2d013f395..3114ec2ca 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -355,6 +355,9 @@ function node_view($node, $main = 0) {
     ** Default behavior:
     */
 
+    $node->teaser = filter($node->teaser);
+    $node->body = filter($node->body);
+
     theme("node", $node, $main);
   }
 }
diff --git a/modules/node/node.module b/modules/node/node.module
index 2d013f395..3114ec2ca 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -355,6 +355,9 @@ function node_view($node, $main = 0) {
     ** Default behavior:
     */
 
+    $node->teaser = filter($node->teaser);
+    $node->body = filter($node->body);
+
     theme("node", $node, $main);
   }
 }