- Patch #350984 by Moshe: kick comment rendering out of node module.

4 files changed, 13 insertions, 2 deletions

diff --git a/themes/bluemarine/node.tpl.php b/themes/bluemarine/node.tpl.php
index 4a6e1fabf..f1789e59f 100644
--- a/themes/bluemarine/node.tpl.php
+++ b/themes/bluemarine/node.tpl.php
@@ -10,4 +10,5 @@
     <div class="taxonomy"><?php print $terms?></div>
     <div class="content"><?php print $content?></div>
     <?php if ($links) { ?><div class="links">&raquo; <?php print $links?></div><?php }; ?>
+    <?php print $comments; ?>
   </div>
diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme
index 307407642..74a332b98 100644
--- a/themes/chameleon/chameleon.theme
+++ b/themes/chameleon/chameleon.theme
@@ -114,7 +114,7 @@ function chameleon_page($content, $show_blocks = TRUE, $show_messages = TRUE) {
   return $output;
 }
 
-function chameleon_node($node, $teaser = 0, $page = 0) {
+function chameleon_node($node, $teaser = 0) {
 
   $output  = "<div class=\"node" . ((!$node->status) ? ' node-unpublished' : '') . (($node->sticky) ? ' sticky' : '') . "\">\n";
 
@@ -153,6 +153,10 @@ function chameleon_node($node, $teaser = 0, $page = 0) {
   }
 
   $output .= "</div>\n";
+  
+  if ($node->content['comments']) {
+    $output .= drupal_render($node->content['comments']);
+  }
 
   return $output;
 }
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index 595bd6b85..b5fdb12d0 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -27,6 +27,9 @@
     <?php if ($links): ?>
       <div class="links"><?php print $links; ?></div>
     <?php endif; ?>
+    
+    <?php print $comments; ?>
+    
   </div>
 
 </div>
diff --git a/themes/pushbutton/node.tpl.php b/themes/pushbutton/node.tpl.php
index c464011ce..eac32a197 100644
--- a/themes/pushbutton/node.tpl.php
+++ b/themes/pushbutton/node.tpl.php
@@ -3,7 +3,7 @@
 ?>
 <div class="node<?php if ($sticky) { print " sticky"; } ?><?php if (!$status) { print " node-unpublished"; } ?>">
   <?php print $picture ?>
-  <?php if ($page == 0): ?>
+  <?php if (!$page): ?>
     <h1 class="title"><a href="<?php print $node_url ?>"><?php print $title ?></a></h1>
   <?php endif; ?>
     <span class="submitted"><?php print $submitted ?></span>
@@ -11,5 +11,8 @@
     <div class="content"><?php print $content ?></div>
     <?php if ($links): ?>
     <div class="links">&raquo; <?php print $links ?></div>
+    
+    <?php print $comments; ?>
+      
     <?php endif; ?>
 </div>