Index: themes/bartik/template.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/template.php,v
retrieving revision 1.5
diff -u -r1.5 template.php
--- themes/bartik/template.php	1 Sep 2010 02:13:58 -0000	1.5
+++ themes/bartik/template.php	19 Sep 2010 19:31:44 -0000
@@ -100,6 +100,17 @@
 }
 
 /**
+ * Override or insert variables into the node template.
+ */
+function bartik_preprocess_node(&$variables) {
+  // Remove the "Add new comment" link on the teaser page or if the comment
+  // form is being displayed on the same page.
+  if ($variables['teaser'] || !empty($variables['content']['comments']['comment_form'])) {
+    unset($variables['content']['links']['#links']['comment-add']);
+  }
+}
+
+/**
  * Override or insert variables into the block template.
  */
 function bartik_preprocess_block(&$variables) {
Index: themes/bartik/templates/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/themes/bartik/templates/node.tpl.php,v
retrieving revision 1.1
diff -u -r1.1 node.tpl.php
--- themes/bartik/templates/node.tpl.php	6 Jul 2010 05:25:51 -0000	1.1
+++ themes/bartik/templates/node.tpl.php	19 Sep 2010 19:31:44 -0000
@@ -106,18 +106,9 @@
     ?>
   </div>
 
-  <?php
-    // Remove the "Add new comment" link on the teaser page or if the comment
-    // form is being displayed on the same page.
-    if ($teaser || !empty($content['comments']['comment_form'])) {
-      unset($content['links']['comment']['#links']['comment-add']);
-    }
-    // Only display the wrapper div if there are links.
-    $links = render($content['links']);
-    if ($links):
-  ?>
+  <?php if ($content['links']): ?>
     <div class="link-wrapper">
-      <?php print $links; ?>
+      <?php print render($content['links']); ?>
     </div>
   <?php endif; ?>