Index: comment.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/blueprint/comment.tpl.php,v
retrieving revision 1.5.2.1.2.7
diff -u -p -r1.5.2.1.2.7 comment.tpl.php
--- comment.tpl.php	16 Oct 2009 00:48:01 -0000	1.5.2.1.2.7
+++ comment.tpl.php	16 Oct 2009 06:04:38 -0000
@@ -12,7 +12,7 @@
           <a id="new"></a>
           <span class="new"><?php print drupal_ucfirst($new) ?></span>
         <?php endif; ?>
-        <?php print l('#'. $comment_count, 'node/'. $comment->nid, array('fragment' => 'comment-'. $comment->cid)); ?>
+        <?php print $comment_count_link ?>
       </div>
       <?php if ($submitted): ?>
         <span class="username"><?php print theme('username', $comment); ?></span> <span class="date"><?php print t('wrote !date ago', array( '!date' => format_interval(time() - $comment->timestamp))); ?></span>
Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/blueprint/template.php,v
retrieving revision 1.15.2.1.2.19
diff -u -p -r1.15.2.1.2.19 template.php
--- template.php	16 Oct 2009 00:48:01 -0000	1.15.2.1.2.19
+++ template.php	16 Oct 2009 06:04:38 -0000
@@ -134,6 +134,13 @@ function blueprint_preprocess_node(&$var
 function blueprint_preprocess_comment(&$vars) {
   static $comment_count = 1; // keep track the # of comments rendered
   
+  // Calculate the comment number for each comment with accounting for pages.
+  if ($page = $_GET['page']) {
+    $comments_per_page = variable_get('comment_default_per_page_' . $vars['node']->type, 1);
+    $comments_previous = $comments_per_page * $page;
+  }
+  $vars['comment_count'] =  $comments_previous + $comment_count;
+    
   // if the author of the node comments as well, highlight that comment
   $node = node_load($vars['comment']->nid);
   if ($vars['comment']->uid == $node->uid) {
@@ -143,8 +150,8 @@ function blueprint_preprocess_comment(&$
   if (!user_access('administer comments')) {
     $vars['links'] = '';
   }
-  // if subjects in comments are turned off, don't show the title then
-  if (!variable_get('comment_subject_field', 1)) {
+  // If comment subjects are disabled, don't display them.
+  if (variable_get('comment_subject_field_' . $vars['node']->type, 1) == 0) {
     $vars['title'] = '';
   }
   // if user has no picture, add in a filler
@@ -152,7 +159,16 @@ function blueprint_preprocess_comment(&$
     $vars['picture'] = '<div class="no-picture">&nbsp;</div>';
   }
 
-  $vars['comment_count'] = $comment_count++;  
+  // Add the pager variable to the title link if it needs it.
+  $fragment = 'comment-' . $vars['comment']->cid;
+  if ($page != NULL) {
+    $query = 'page='. $page;
+  }
+  $vars['title'] = l($vars['comment']->subject, $vars['node']->path, array('query' => $query, 'fragment' => $fragment));
+  $vars['comment_count_link'] = l('#'. $vars['comment_count'], $vars['node']->path, array('query' => $query, 'fragment' => $fragment));
+
+
+  $comment_count++;
 }
 
 /**