Index: modules/comment/comment.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.test,v
retrieving revision 1.37
diff -u -p -r1.37 comment.test
--- modules/comment/comment.test	20 Jul 2009 18:51:32 -0000	1.37
+++ modules/comment/comment.test	27 Jul 2009 16:27:16 -0000
@@ -446,7 +446,7 @@ class CommentAnonymous extends CommentHe
     // "Login or register to post comments" type link may be shown.
     $this->drupalLogout();
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertNoRaw('<div id="comments">', t('Comments were not displayed.'));
+    $this->assertNoRaw('<div id="comments"', t('Comments were not displayed.'));
     $this->assertNoLink('Add new comment', t('Link to add comment was found.'));
 
     // Attempt to view node-comment form while disallowed.
@@ -459,7 +459,7 @@ class CommentAnonymous extends CommentHe
     $this->setAnonymousUserComment(TRUE, FALSE, FALSE);
     $this->drupalLogout();
     $this->drupalGet('node/' . $this->node->nid);
-    $this->assertRaw('<div id="comments">', t('Comments were displayed.'));
+    $this->assertRaw('<div id="comments"', t('Comments were displayed.'));
     $this->assertLink('Login', 1, t('Link to login was found.'));
     $this->assertLink('register', 1, t('Link to register was found.'));
   }
Index: themes/garland/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/template.php,v
retrieving revision 1.22
diff -u -p -r1.22 template.php
--- themes/garland/template.php	2 Jun 2009 03:57:22 -0000	1.22
+++ themes/garland/template.php	27 Jul 2009 16:27:16 -0000
@@ -15,14 +15,11 @@ function garland_breadcrumb($breadcrumb)
 }
 
 /**
- * Allow themable wrapping of all comments.
+ * Add a "Comments" heading above comments except on forum pages.
  */
-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>';
+function garland_preprocess_comment_wrapper(&$vars) {
+  if ($vars['content'] && $vars['node']->type != 'forum') {
+    $vars['content'] = '<h2 class="comments">' . t('Comments') . '</h2>' .  $vars['content'];
   }
 }