- Patch #523950 by moshe weitzman, yched, catch: update comment rendering to take full advantage of the drupal_render() paradigm.

2 files changed, 3 insertions, 17 deletions

diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index e2edf0dc0..c9daefc00 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -8,7 +8,7 @@
     <span class="submitted"><?php print $submitted; ?></span>
   <?php endif; ?>
 
-  <?php if ($comment->new) : ?>
+  <?php if ($new) : ?>
     <span class="new"><?php print drupal_ucfirst($new) ?></span>
   <?php endif; ?>
 
@@ -17,7 +17,7 @@
     <h3><?php print $title ?></h3>
 
     <div class="content">
-      <?php print $content ?>
+      <?php hide($content['links']); print render($content); ?>
       <?php if ($signature): ?>
       <div class="clearfix">
         <div>—</div>
@@ -27,7 +27,5 @@
     </div>
   </div>
 
-  <?php if ($links): ?>
-    <div class="links"><?php print $links ?></div>
-  <?php endif; ?>
+  <?php print render($content['links']) ?>
 </div>
diff --git a/themes/garland/template.php b/themes/garland/template.php
index 24d1e64e3..e1be8efc0 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -15,18 +15,6 @@ function garland_breadcrumb($breadcrumb) {
 }
 
 /**
- * Allow themable wrapping of all comments.
- */
-function garland_comment_wrapper($content, $node) {
-  if (!$content || $node->type == 'forum') {
-    return '<div id="comments">' . $content . '</div>';
-  }
-  else {
-    return '<div id="comments"><h2 class="comments">' . t('Comments') . '</h2>' . $content . '</div>';
-  }
-}
-
-/**
  * Override or insert variables into the page template.
  */
 function garland_preprocess_page(&$vars) {