From d8f78a7c9526f473ac26d4b51b09d235720c1858 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 26 May 2003 19:50:39 +0000
Subject: - Removed check_output() from the theme system layer.

---
 includes/theme.inc               | 4 ++--
 modules/comment.module           | 1 +
 modules/comment/comment.module   | 1 +
 modules/node.module              | 3 +++
 modules/node/node.module         | 3 +++
 themes/marvin/marvin.theme       | 6 +++---
 themes/unconed/unconed.theme     | 6 +++---
 themes/xtemplate/xtemplate.theme | 6 ++----
 8 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/includes/theme.inc b/includes/theme.inc
index 31f7aabbc..2f1569b44 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -54,10 +54,10 @@ class BaseTheme {
     }
 
     if ($main && $node->teaser) {
-      $output .= check_output($node->teaser);
+      $output .= $node->teaser;
     }
     else {
-      $output .= check_output($node->body);
+      $output .= $node->body;
     }
     if ($links = link_node($node, $main)) {
       $output .= "<br />[ ". $this->links($links) ." ]";
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);
   }
 }
diff --git a/themes/marvin/marvin.theme b/themes/marvin/marvin.theme
index 6614ade7f..7f2e91fd0 100644
--- a/themes/marvin/marvin.theme
+++ b/themes/marvin/marvin.theme
@@ -98,10 +98,10 @@
      print " <tr><td colspan=\"2\">&nbsp;</td></tr>\n";
 
      if ($main && $node->teaser) {
-       print " <tr><td colspan=\"2\"><p>". check_output($node->teaser) ."</p></td></tr>\n";
+       print " <tr><td colspan=\"2\"><p>$node->teaser</p></td></tr>\n";
      }
      else {
-       print " <tr><td colspan=\"2\"><p>". check_output($node->body) ."</p></td></tr>\n";
+       print " <tr><td colspan=\"2\"><p>$node->body</p></td></tr>\n";
      }
 
      print " <tr><td colspan=\"2\">&nbsp;</td></tr>\n";
@@ -147,7 +147,7 @@
 
      // Print body of comment:
      if ($comment->comment) {
-       print "    <tr><td bgcolor=\"#FFFFFF\">". check_output($comment->comment) ."</td></tr>\n";
+       print "    <tr><td bgcolor=\"#FFFFFF\">$comment->comment</td></tr>\n";
      }
 
      // Print bottom link(s):
diff --git a/themes/unconed/unconed.theme b/themes/unconed/unconed.theme
index 41ad41dfc..f1dee7e58 100644
--- a/themes/unconed/unconed.theme
+++ b/themes/unconed/unconed.theme
@@ -115,10 +115,10 @@
           <TD BGCOLOR="<?php echo $this->bgcolor2 ?>" COLSPAN="2">
           <?php
            if ($main && $node->teaser) {
-             echo "<P>". check_output($node->teaser) ."</P>";
+             echo "<P>$node->teaser</P>";
            }
            else {
-             echo "<P>". check_output($node->body) ."</P>";
+             echo "<P>$node->body</P>";
            }
           ?>
           </TD>
@@ -167,7 +167,7 @@
      echo " </TR>";
 
      // Print body of comment:
-     if ($comment) echo " <TR><TD BGCOLOR=\"$this->bgcolor2\">". check_output($comment->comment) ."</TD></TR>";
+     if ($comment) echo " <TR><TD BGCOLOR=\"$this->bgcolor2\">$comment->comment</TD></TR>";
 
      // Print bottom link(s):
      echo " <TR><TD ALIGN=\"right\" BGCOLOR=\"$this->bgcolor3\">[ $link ]</TD></TR>";
diff --git a/themes/xtemplate/xtemplate.theme b/themes/xtemplate/xtemplate.theme
index 60d51406f..4d23996fa 100644
--- a/themes/xtemplate/xtemplate.theme
+++ b/themes/xtemplate/xtemplate.theme
@@ -35,9 +35,7 @@ class Theme_xtemplate extends BaseTheme {
        "title"     => ucfirst($node->title),
        "author"    => format_name($node),
        "date"      => format_date($node->created),
-       "content"   => ($main && $node->teaser) ?
-                      check_output($node->teaser) :
-                      check_output($node->body)));
+       "content"   => ($main && $node->teaser) ? $node->teaser : $node->body));
 
     if ($taxonomy = taxonomy_link("taxonomy terms", $node)) {
       $this->template->assign("taxonomy", $this->links($taxonomy));
@@ -57,7 +55,7 @@ class Theme_xtemplate extends BaseTheme {
         "title"     => ucfirst($comment->subject),
         "author"    => format_name($comment),
         "date"      => format_date($comment->timestamp),
-        "content"   => check_output($comment->comment),
+        "content"   => $comment->comment,
         "links"     => $link));
 
     if ($comment->new) {
-- 
cgit v1.2.3