Commit d8f78a7c authored by Dries's avatar Dries

- Removed check_output() from the theme system layer.
parent 1cdda38d
......@@ -54,10 +54,10 @@ function node($node, $main) {
}
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) ." ]";
......
......@@ -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 {
......
......@@ -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 {
......
......@@ -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);
}
}
......
......@@ -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);
}
}
......
......@@ -98,10 +98,10 @@ function node($node, $main = 0) {
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 @@ function comment($comment, $link = "") {
// 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):
......
......@@ -115,10 +115,10 @@ function node($node, $main = 0) {
<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 @@ function comment($comment, $link) {
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>";
......
......@@ -35,9 +35,7 @@ function node($node, $main = 0) {
"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 @@ function comment($comment, $link = 0) {
"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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment