- Patch #160589 by dvessel: tpl-ify the comment module's theme functions.

3 files changed, 2 insertions, 8 deletions

diff --git a/themes/garland/comment.tpl.php b/themes/garland/comment.tpl.php
index b6c1af73d..6364021a8 100644
--- a/themes/garland/comment.tpl.php
+++ b/themes/garland/comment.tpl.php
@@ -6,7 +6,6 @@
   <?php endif; ?>
 
   <?php if ($comment->new) : ?>
-    <a id="new"></a>
     <span class="new"><?php print drupal_ucfirst($new) ?></span>
   <?php endif; ?>
 
diff --git a/themes/garland/node.tpl.php b/themes/garland/node.tpl.php
index f0e24936c..8c267d671 100644
--- a/themes/garland/node.tpl.php
+++ b/themes/garland/node.tpl.php
@@ -1,5 +1,3 @@
-<?php phptemplate_comment_wrapper(NULL, $node->type); ?>
-
 <div id="node-<?php print $node->nid; ?>" class="node<?php if ($sticky) { print ' sticky'; } ?><?php if (!$status) { print ' node-unpublished'; } ?>">
 
 <?php print $picture ?>
diff --git a/themes/garland/template.php b/themes/garland/template.php
index cf605f5b4..89fd4f13e 100644
--- a/themes/garland/template.php
+++ b/themes/garland/template.php
@@ -40,11 +40,8 @@ function phptemplate_breadcrumb($breadcrumb) {
 /**
  * Allow themable wrapping of all comments.
  */
-function phptemplate_comment_wrapper($content, $type = null) {
-  static $node_type;
-  if (isset($type)) $node_type = $type;
-
-  if (!$content || $node_type == 'forum') {
+function phptemplate_comment_wrapper($content, $node) {
+  if (!$content || $node->type == 'forum') {
     return '<div id="comments">'. $content .'</div>';
   }
   else {