=== modified file 'modules/comment/comment.admin.inc'
--- modules/comment/comment.admin.inc	2009-10-16 21:00:03 +0000
+++ modules/comment/comment.admin.inc	2009-10-26 04:01:36 +0000
@@ -72,7 +72,7 @@ function comment_admin_overview($form, &
   $query->addField('u', 'name', 'registered_name');
   $query->addField('n', 'title', 'node_title');
   $result = $query
-    ->fields('c', array('subject', 'nid', 'cid', 'comment', 'changed', 'status', 'name', 'homepage'))
+    ->fields('c', array('subject', 'nid', 'cid', 'changed', 'status', 'name', 'homepage'))
     ->fields('u', array('uid'))
     ->condition('c.status', $status)
     ->limit(50)
@@ -88,7 +88,7 @@ function comment_admin_overview($form, &
     $options[$comment->cid] = array(
       'subject' => l($comment->subject, 'comment/' . $comment->cid, array('attributes' => array('title' => truncate_utf8($comment->comment, 128)), 'fragment' => 'comment-' . $comment->cid)),
       'author' => theme('username', array('account' => $comment)),
-      'posted_in' => l($comment->node_title, 'node/' . $comment->nid),
+      'posted_in' => l($comment->node_title, 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)),
       'changed' => format_date($comment->changed, 'short'),
       'operations' => l(t('edit'), 'comment/' . $comment->cid .'/edit', array('query' => $destination)),
     );
@@ -140,7 +140,7 @@ function comment_admin_overview_submit($
         // Allow modules to respond to the updating of a comment.
         module_invoke_all('comment_' . $form_state['values']['operation'], $comment);
         // Add an entry to the watchdog log.
-        watchdog('content', 'Comment: updated %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'node/' . $comment->nid, array('fragment' => 'comment-' . $comment->cid)));
+        watchdog('content', 'Comment: updated %cid.', array('%cid' => $comment->cid), WATCHDOG_NOTICE, l(t('view'), 'node/' . $comment->nid, array('fragment' => 'comment-' . $comment->cid)));
       }
     }
     cache_clear_all();
@@ -173,7 +173,7 @@ function comment_multiple_delete_confirm
     $comment = comment_load($cid);
     if (is_object($comment) && is_numeric($comment->cid)) {
       $subject = db_query('SELECT subject FROM {comment} WHERE cid = :cid', array(':cid' => $cid))->fetchField();
-      $form['comments'][$cid] = array('#type' => 'hidden', '#value' => $cid, '#prefix' => '<li>', '#suffix' => check_plain($subject) . '</li>');
+      $form['comments'][$cid] = array('#type' => 'hidden', '#value' => $cid);
       $comment_counter++;
     }
   }
@@ -215,7 +215,7 @@ function comment_confirm_delete($form, &
   $form['#comment'] = $comment;
   return confirm_form(
     $form,
-    t('Are you sure you want to delete the comment %title?', array('%title' => $comment->subject)),
+    t('Are you sure you want to delete the comment by %name', array('%name' => $comment->name)),
     'node/' . $comment->nid,
     t('Any replies to this comment will be lost. This action cannot be undone.'),
     t('Delete'),

=== modified file 'modules/comment/comment.install'
--- modules/comment/comment.install	2009-10-16 14:00:04 +0000
+++ modules/comment/comment.install	2009-10-26 04:15:27 +0000
@@ -10,6 +10,9 @@
  * Implement hook_uninstall().
  */
 function comment_uninstall() {
+  // Delete comment_body field.
+  field_delete_field('comment_body');
+
   // Remove variables.
   variable_del('comment_block_count');
   $node_types = array_keys(node_type_get_types());
@@ -43,6 +46,19 @@ function comment_enable() {
   db_insert('node_comment_statistics')
     ->from($query)
     ->execute();
+
+  // Create comment body field.
+  // @todo this should be done in comment_install, but causes exceptions
+  // in simpletest due to dependencies between entity_get_info() and
+  // taxonomy_install().
+  $field = array(
+    'field_name' => 'comment_body',
+    'type' => 'text_long',
+  );
+  field_create_field($field);
+
+  // Create instances on all existing node types.
+  node_types_rebuild();
 }
 
 /**
@@ -194,6 +210,92 @@ function comment_update_7009() {
   return array();
 }
 
+ /**
+ * Create the comment_body field.
+ */
+function comment_update_7010() {
+  $ret = array();
+  // Create comment body field.
+  $field = array(
+    'field_name' => 'comment_body',
+    'type' => 'text_long',
+  );
+  field_create_field($field);
+
+  // Add the field to comments for all existing bundles.
+  $body_instance = array(
+    'field_name' => 'comment_body',
+    'label' => 'Body',
+    'object_type' => 'comment',
+    'settings' => array('text_processing' => 1),
+    // Hide field labels by default.
+    'display' => array(
+      'full' => array(
+        'label' => 'hidden',
+      ),
+    ),
+  );
+  foreach (node_type_get_types() as $info) {
+    $body_instance['bundle'] = 'comment_node_' . $info->type;
+    field_create_instance($body_instance);
+  }
+
+  return array();
+}
+
+/**
+ * Migrate data from the comment field to field storage.
+ */
+function comment_update_7011(&$context) {
+  $ret = array();
+
+  // This is a multipass update. First set up some comment variables.
+  if (empty($context['total'])) {
+    $comments = (bool) db_query_range('SELECT 1 FROM {comment}', 0, 1)->fetchField();
+    if (!$comments) {
+      // The update will finish when $context['types'] is an empty array.
+      // Since we have nothing to do if there's no comments on the site, except
+      // drop the columns, set that here for convenience.
+      $context['types'] = array();
+    }
+    else {
+      $context['etid'] = _field_sql_storage_etid('comment');
+      $context['types'] = node_type_get_types();
+    }
+    $context['total'] = count($context['types']);
+  }
+  if (!empty($context['types'])) {
+    $type = array_shift($context['types']);
+
+    $query = db_select('comment', 'c');
+    $query->innerJoin('node', 'n', 'c.nid = n.nid AND n.type = :type', array(':type' => $type->type));
+    $query->addField('c', 'cid', 'entity_id');
+    $query->addExpression("'comment_node_$type->type'", 'bundle');
+    $query->addExpression($context['etid'], 'etid');
+    $query->addExpression('0', 'deleted');
+    $query->addExpression("'" . FIELD_LANGUAGE_NONE . "'", 'language');
+    $query->addExpression('0', 'delta');
+    $query->addField('c', 'comment', 'comment_body_value');
+    $query->addField('c', 'format', 'comment_body_format');
+
+    $comment_body = field_info_field('comment_body');
+    $comment_body_table = _field_sql_storage_tablename($comment_body);
+
+    db_insert($comment_body_table)
+      ->from($query)
+      ->execute();
+  }
+
+  // On the last pass of the update, $context['types'] will be empty.
+  if (empty($context['types'])) {
+    db_drop_field($ret, 'comment', 'subject');
+  }
+
+  $ret['#finished'] = 1 - count($context['types']) / $context['total'];
+
+  return $ret;
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
@@ -236,12 +338,6 @@ function comment_schema() {
         'default' => '',
         'description' => 'The comment title.',
       ),
-      'comment' => array(
-        'type' => 'text',
-        'not null' => TRUE,
-        'size' => 'big',
-        'description' => 'The comment body.',
-      ),
       'hostname' => array(
         'type' => 'varchar',
         'length' => 128,
@@ -269,13 +365,6 @@ function comment_schema() {
         'size' => 'tiny',
         'description' => 'The published status of a comment. (0 = Not Published, 1 = Published)',
       ),
-      'format' => array(
-        'type' => 'int',
-        'size' => 'small',
-        'not null' => TRUE,
-        'default' => 0,
-        'description' => 'The {filter_format}.format of the comment body.',
-      ),
       'thread' => array(
         'type' => 'varchar',
         'length' => 255,

=== modified file 'modules/comment/comment.module'
--- modules/comment/comment.module	2009-10-23 23:00:03 +0000
+++ modules/comment/comment.module	2009-10-26 05:10:54 +0000
@@ -236,6 +236,22 @@ function comment_count_unpublished() {
  */
 function comment_node_type_insert($info) {
   field_attach_create_bundle('comment', 'comment_node_' . $info->type);
+
+  // Attach the body field by default.
+  $instance = array(
+    'field_name' => 'comment_body',
+    'label' =>'Body',
+    'object_type' => 'comment',
+    'bundle' => 'comment_node_' . $info->type,
+    'settings' => array('text_processing' => 1),
+    // Hide field labels by default.
+    'display' => array(
+      'full' => array(
+        'label' => 'hidden',
+      ),
+    ),
+  );
+  field_create_instance($instance);
 }
 
 /**
@@ -393,13 +409,17 @@ function comment_get_recent($number = 10
   //         and are visible to the current user.
   $nids = db_query_range("SELECT nc.nid FROM {node_comment_statistics} nc WHERE nc.comment_count > 0 ORDER BY nc.last_comment_timestamp DESC", 0, $number)->fetchCol();
 
-  $comments = array();
   if (!empty($nids)) {
     // Step 2: From among the comments on the nodes selected in the first query,
     //         find the $number of most recent comments.
     // Using Query Builder here for the IN-Statement.
     $query = db_select('comment', 'c');
     $query->innerJoin('node', 'n', 'n.nid = c.nid');
+    $query->innerJoin('users', 'u', 'u.uid = c.uid');
+////    $query->addField('n', 'title', 'node_title');
+    $query->addExpression('IF(c.uid != 0, u.name, c.name)', 'name');
+//-      ->fields('c', array('nid', 'subject', 'cid', 'created', 'changed'))
+//+      ->fields('c', array('nid', 'cid', 'uid', 'timestamp'))
     return $query
       ->fields('c', array('nid', 'subject', 'cid', 'created', 'changed'))
       ->condition('c.nid', $nids, 'IN')
@@ -411,7 +431,7 @@ function comment_get_recent($number = 10
       ->fetchAll();
   }
 
-  return $comments;
+  return array();
 }
 
 /**
@@ -474,8 +494,12 @@ function comment_new_page_count($num_com
 function theme_comment_block() {
   $items = array();
   $number = variable_get('comment_block_count', 10);
+
   foreach (comment_get_recent($number) as $comment) {
-    $items[] = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)) . '<br />' . t('@time ago', array('@time' => format_interval(REQUEST_TIME - $comment->changed)));
+    $name = theme('username', $comment);
+    $comment_permalink = url('comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid));
+    $time_ago = format_interval(REQUEST_TIME - $comment->timestamp);
+    $items[] = t('!username on <a href="@comment_permalink">@node_title</a> @time ago', array('!username' => $name, '@comment_permalink' => $comment_permalink, '@node_title' => $comment->node_title, '@time' => $time_ago));
   }
 
   if ($items) {
@@ -843,11 +867,6 @@ function comment_build_content($comment,
     $comment->content = array();
   }
 
-  // Build comment body.
-  $comment->content['comment_body'] = array(
-    '#markup' => check_markup($comment->comment, $comment->format, '', TRUE),
-  );
-
   field_attach_prepare_view('comment', array($comment->cid => $comment), $build_mode);
   $comment->content += field_attach_view('comment', $comment, $build_mode);
 
@@ -1163,17 +1182,12 @@ function comment_node_delete($node) {
  * Implement hook_node_update_index().
  */
 function comment_node_update_index($node) {
-  $text = '';
-  if ($node->comment != COMMENT_NODE_HIDDEN) {
-    $comments = db_query('SELECT subject, comment, format FROM {comment} WHERE nid = :nid AND status = :status', array(
-      ':nid' => $node->nid,
-      ':status' => COMMENT_PUBLISHED
-    ));
-    foreach ($comments as $comment) {
-      $text .= '<h2>' . check_plain($comment->subject) . '</h2>' . check_markup($comment->comment, $comment->format, '', TRUE);
-    }
+  if ($node->comment && $cids = comment_get_thread($node)) {
+    $comments = comment_load_multiple($cids);
+    comment_prepare_thread($comments);
+    $build = comment_build_multiple($comments, $node);
   }
-  return $text;
+  return drupal_render($build);
 }
 
 /**
@@ -1292,8 +1306,6 @@ function comment_save($comment) {
         'created' => $comment->created,
         'changed' => $comment->changed,
         'subject' => $comment->subject,
-        'comment' => $comment->comment,
-        'format' => $comment->comment_format,
         'uid' => $comment->uid,
         'name' => $comment->name,
         'mail' => $comment->mail,
@@ -1306,7 +1318,7 @@ function comment_save($comment) {
     // Allow modules to respond to the updating of a comment.
     module_invoke_all('comment_update', $comment);
     // Add an entry to the watchdog log.
-    watchdog('content', 'Comment: updated %subject.', array('%subject' => $comment->subject), WATCHDOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)));
+    watchdog('content', 'Comment: updated %cid.', array('%subject' => $comment->cid), WATCHDOG_NOTICE, l(t('view'), 'comment/' . $comment->cid, array('fragment' => 'comment-' . $comment->cid)));
   }
   else {
     // Add the comment to database. This next section builds the thread field.
@@ -1368,8 +1380,6 @@ function comment_save($comment) {
         'pid' => empty($comment->pid) ? 0 : $comment->pid,
         'uid' => $comment->uid,
         'subject' => $comment->subject,
-        'comment' => $comment->comment,
-        'format' => $comment->comment_format,
         'hostname' => ip_address(),
         'created' => $comment->created,
         'changed' => $comment->changed,
@@ -1435,6 +1445,7 @@ function comment_delete_multiple($cids) 
       comment_delete_multiple($child_cids);
       _comment_update_node_statistics($comment->nid);
     }
+    parent::attachLoad($comments);
   }
 }
 
@@ -1845,15 +1856,6 @@ function comment_form($form, &$form_stat
     $default = '';
   }
 
-  $form['comment'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Comment'),
-    '#rows' => 15,
-    '#default_value' => $default,
-    '#text_format' => isset($comment->format) ? $comment->format : filter_default_format(),
-    '#required' => TRUE,
-  );
-
   $form['cid'] = array(
     '#type' => 'value',
     '#value' => !empty($comment->cid) ? $comment->cid : NULL,
@@ -1928,8 +1930,6 @@ function comment_preview($comment) {
   $node = node_load($comment->nid);
 
   if (!form_get_errors()) {
-    $comment->format = $comment->comment_format;
-
     // Attach the user and time information.
     if (!empty($comment->author)) {
       $account = user_load_by_name($comment->author);
@@ -2113,8 +2113,8 @@ function comment_form_submit($form, &$fo
     $redirect = array('node/' . $node->nid, array('query' => $query, 'fragment' => 'comment-' . $comment->cid));
   }
   else {
-    watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject), WATCHDOG_WARNING);
-    drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed post %subject.', array('%subject' => $comment->subject)), 'error');
+    watchdog('content', 'Comment: unauthorized comment submitted or comment submitted to a closed post %title.', array('%title' => $node->title), WATCHDOG_WARNING);
+    drupal_set_message(t('Comment: unauthorized comment submitted or comment submitted to a closed post %title.', array('%title' => $node->title)), 'error');
     // Redirect the user to the node they are commenting on.
     $redirect = 'node/' . $node->nid;
   }
@@ -2140,6 +2140,7 @@ function template_preprocess_comment(&$v
   $variables['picture']   = theme_get_setting('toggle_comment_user_picture') ? theme('user_picture', array('account' => $comment)) : '';
   $variables['signature'] = $comment->signature;
   $variables['title']     = l($comment->subject, 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
+  $variables['permalink'] = l('#', 'comment/' . $comment->cid, array('fragment' => "comment-$comment->cid"));
   $variables['template_files'][] = 'comment-' . $variables['node']->type;
 
   // Helpful $content variable for templates.
@@ -2400,7 +2401,7 @@ function comment_unpublish_action($comme
     ->fields(array('status' => COMMENT_NOT_PUBLISHED))
     ->condition('cid', $cid)
     ->execute();
-  watchdog('action', 'Unpublished comment %subject.', array('%subject' => $subject));
+  watchdog('action', 'Unpublished comment %cid.', array('%cid' => $cid));
 }
 
 /**
@@ -2419,12 +2420,13 @@ function comment_unpublish_action($comme
  */
 function comment_unpublish_by_keyword_action($comment, $context) {
   foreach ($context['keywords'] as $keyword) {
-    if (strpos($comment->comment, $keyword) !== FALSE || strpos($comment->subject, $keyword) !== FALSE) {
+    $text = drupal_render($comment);
+    if (strpos($text, $keyword) !== FALSE) {
       db_update('comment')
         ->fields(array('status' => COMMENT_NOT_PUBLISHED))
         ->condition('cid', $comment->cid)
         ->execute();
-      watchdog('action', 'Unpublished comment %subject.', array('%subject' => $comment->subject));
+      watchdog('action', 'Unpublished comment %cid.', array('%cid' => $comment->cid));
       break;
     }
   }
@@ -2486,16 +2488,6 @@ function comment_menu_alter(&$items) {
 }
 
 /**
- * Implement hook_filter_format_delete().
- */
-function comment_filter_format_delete($format, $fallback) {
-  db_update('comment')
-    ->fields(array('format' => $fallback->format))
-    ->condition('format', $format->format)
-    ->execute();
-}
-
-/**
  * Implements hook_rdf_mapping().
  */
 function comment_rdf_mapping() {

=== modified file 'modules/comment/comment.pages.inc'
--- modules/comment/comment.pages.inc	2009-10-16 21:00:03 +0000
+++ modules/comment/comment.pages.inc	2009-10-26 04:52:48 +0000
@@ -108,7 +108,7 @@ function comment_reply($node, $pid = NUL
  */
 function comment_approve($comment) {
   $comment->status = COMMENT_PUBLISHED;
-  $comment->comment_format = $comment->format;
+//  $comment->comment_format = $comment->format;
   comment_save($comment);
 
   drupal_set_message(t('Comment approved.'));

=== modified file 'modules/comment/comment.tpl.php'
--- modules/comment/comment.tpl.php	2009-10-19 21:00:03 +0000
+++ modules/comment/comment.tpl.php	2009-10-26 04:54:06 +0000
@@ -18,6 +18,7 @@
  *   Preprocess functions can reformat it by calling format_date() with the
  *   desired parameters on the $comment->changed variable.
  * - $new: New comment marker.
+ * - $permalink: Comment permalink.
  * - $picture: Authors picture.
  * - $signature: Authors signature.
  * - $status: Comment status. Possible values are:
@@ -64,6 +65,7 @@
   <h3<?php print $title_attributes; ?>><?php print $title ?></h3>
 
   <div class="submitted">
+    <?php print $permalink; ?>
     <?php
       print t('Submitted by !username on !datetime.',
         array('!username' => $author, '!datetime' => $created));

=== modified file 'themes/garland/comment.tpl.php'
--- themes/garland/comment.tpl.php	2009-10-19 02:00:03 +0000
+++ themes/garland/comment.tpl.php	2009-10-26 04:55:37 +0000
@@ -4,6 +4,7 @@
 <div class="<?php print $classes . ' ' . $zebra; ?>"<?php print $attributes; ?>>
 
   <div class="clearfix">
+    <span class="submitted"><?php print $permalink; ?> <?php print $created; ?> — <?php print $author; ?></span>
 
   <?php if ($contextual_links): ?>
     <?php print render($contextual_links); ?>
@@ -11,11 +12,11 @@
 
     <span class="submitted"><?php print $created; ?> — <?php print $author; ?></span>
 
-  <?php if ($new) : ?>
-    <span class="new"><?php print drupal_ucfirst($new) ?></span>
-  <?php endif; ?>
+    <?php if ($new) : ?>
+      <span class="new"><?php print drupal_ucfirst($new) ?></span>
+    <?php endif; ?>
 
-  <?php print $picture ?>
+    <?php print $picture ?>
 
     <h3<?php print $title_attributes; ?>><?php print $title ?></h3>