Index: modules/comment/comment.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/comment/comment.module,v
retrieving revision 1.904
diff -u -p -r1.904 comment.module
--- modules/comment/comment.module	5 Oct 2010 06:17:28 -0000	1.904
+++ modules/comment/comment.module	8 Oct 2010 12:20:27 -0000
@@ -2219,9 +2219,17 @@ function template_preprocess_comment(&$v
   $variables['picture']   = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : '';
   $variables['signature'] = $comment->signature;
 
-  $uri = entity_uri('comment', $comment);
-  $uri['options'] += array('attributes' => array('class' => 'permalink', 'rel' => 'bookmark'));
+  if ($comment->cid) {
+    $uri = entity_uri('comment', $comment);
+  }
+  else {
+    $uri = array(
+      'path' => $_GET['q'],
+      'options' => array('attributes' => array(), 'fragment' => ' '),
+    );
+  }
 
+  $uri['options'] += array('attributes' => array('class' => 'permalink', 'rel' => 'bookmark'));
   $variables['title']     = l($comment->subject, $uri['path'], $uri['options']);
   $variables['permalink'] = l(t('Permalink'), $uri['path'], $uri['options']);